From nobody Thu Apr 2 20:26:40 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81ADB3A7582 for ; Thu, 26 Mar 2026 21:35:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774560917; cv=none; b=JXd363ZdPI887PUp+KCceMezuPk3v8YiJuRnOOP7nwGYs4Dr4QGWkb4iJnveNMOS18MGIwQnc0yJMFEWE2T2wxMFnMQ9unMza61yrndoBI/4oKXpOefVkCCknhhedddMAunvSS3ozkl8wAqTX4rTB+1Pk5vJr8sJ6XHtMP5J3S0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774560917; c=relaxed/simple; bh=ez5aAwkAd5qsck46sQ1rbD1CCA7NFpeVTS9fL0whzBs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kSP4vNSzAtnI5JhR2qozmSXGFom41VShs2YG0QMLbFbhgL07nyM1XRgrSIQ7nRrRVcXwX9jg8evCIBYR8fqifQvK7LzgQIlcS9EJraM9auqwVM5fm+n78j/JoEKV/QuwW+6+gOVOKG8heREw0VdgfYhBJRB3Y+PCYJYPXRehKtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JyP7rAtZ; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JyP7rAtZ" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so13501215e9.0 for ; Thu, 26 Mar 2026 14:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774560915; x=1775165715; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fmSa6Nj2pzOSB63unXnRZ4rb/ic4PWoX2DWS6MyutAs=; b=JyP7rAtZ6AvNrXU/zmfVtBbjRZ9pE+MjUTYZFsOxzfri5GYv0PerZSXIJBLEam1c5c bhbEGiWhoO4XkouyQsrR1Cr+jxSLrBIs4VheO5ATjI5FUQPGjT3DefxbIgbWICOZ8ttd sz6WhOBbjtnSmto0kj1IA9/fQkWEQNgRr+uqLhTxOLbKpr+5vj/ysWVNmUHBdwfMB+YK cZ/Q3BBkROFcRdQqIGEHYXph3X90t3EZDddkQSguc26lZJMojix6HeFraptWnHcarfeY gTeFivrNomPDkZaXp0ILhdsO6PGDzvBjk5kHepY7vHwzLTawgXWbecSCY8i3MJzjyBos MmKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774560915; x=1775165715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fmSa6Nj2pzOSB63unXnRZ4rb/ic4PWoX2DWS6MyutAs=; b=Kte5zYQHtwO15o78W+XrYNZ0A8y/VDoAFkIjWXaF2G4v7hMqzfEaabusCSSNsJ2CFT 5cDzTkewA80NBdvYGXo1OWjhy5eKgvWEoo2GJ9pep97RIlTaIu4OjbetpzR0gh3yAqwM NNU/y31EpOmMDXEiTGZ/bvVM1X8G2Tiv+K2X2/WYfckS67n03qFG8phWGwNfeJZDZ/Jm UQsa18lsk48M1Qy1dgaQMHdsW2zciMu5SGPqB4I+knDJJ2jh53EnUtgYkXMlK6UHKqA5 0oogpsdO61n8AKbQ9s3YkrakmYmfh686Y+gvvVSi0K1IoeNpOZP5zXRDSby6FMHNAQK4 9FOw== X-Forwarded-Encrypted: i=1; AJvYcCU3MUiCNASgSS6XRVpACT8PJql9bKrxmYCITRAHdPSyVrBDMawigYC1u7KkG2kp4DhyzrSrWXncs4TXaag=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2XqqRbUKFCbqHs3wWD1Nt6/qoXqth7g7lQdJz4HvjNcnGXEs/ 6LLSPvGMPgJMK5p6JWXcK1GfDsPw39rU4lAafA/1zRfB3+BGVHA+w7Xk X-Gm-Gg: ATEYQzytZ29NcKCDqZJT4Fo8JrNuflofX93BmmHOwFlsA0Vi1B0tHb0+Tf7TvgiwWkT /X8b+Q5wMXQyhRXNxf3eLlOuMur6yZFY+CKJR5+18+Yo/O9fhWfTx4w8lLNZV9UO1MPOrMkyDdb G229DNEd2CMpX20cP1pkkzDGoymfihvcHnX7EsR9JiVUPzp9i/UCWPs6pMxgN8UIi8KUOcusPXj HxLJZ4CBUnIUQHH7cLmd/ypKZ+VfTlSu6l5pMLJ2Acl2eS6qGBx5nBcRL6S+5VsCqqKVxfSmNUm i/0b6w1C+8S6WCW/a+kVNmLIYnYVvLhfq7Bao5BD2unDfW34bi9WbC/SyQLVCZo9OOsPYhvBaBS LVnSbp6y9zhtRiIX8ID1nPVNhM0T/CtQY1emWCmqUONvIovwDz9e293efwUde9DSQbcOxZ/6CYF 8GxwFnp/VFSQ/NJo9vm+xc/RpMQS5TdvnkIItnZa8TPyVISQ== X-Received: by 2002:a05:600c:a44:b0:486:fbf6:abd4 with SMTP id 5b1f17b1804b1-48727efc11dmr2581025e9.9.1774560914810; Thu, 26 Mar 2026 14:35:14 -0700 (PDT) Received: from localhost.localdomain ([2a00:f41:1855:4ab5:5c9b:17ff:fe26:9b2c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722c7cec3sm51106825e9.6.2026.03.26.14.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 14:35:14 -0700 (PDT) From: "Jose A. Perez de Azpillaga" To: linux-staging@lists.linux.dev Cc: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Greg Kroah-Hartman , Kees Cook , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] staging: media: atomisp: improve cleanup robustness in ia_css_stream_destroy_isp2401() Date: Thu, 26 Mar 2026 22:34:09 +0100 Message-ID: <20260326213442.876745-4-azpijr@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326213442.876745-1-azpijr@gmail.com> References: <20260326213442.876745-1-azpijr@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the 'assert(entry)' call. In the atomisp driver, assert() is a wrapper around BUG(), which intentionally crashes the entire kernel. This is dangerous and inappropriate for a simple null pointer check during stream teardown. Replace it with a safe 'if (!entry) continue;' check. Change the early 'return' to a 'continue'. In a destruction path, it is better to proceed with cleaning up as many resources as possible rather than aborting early, which would result in memory leaks for the remaining pipes. Signed-off-by: Jose A. Perez de Azpillaga --- drivers/staging/media/atomisp/pci/sh_css.c | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/m= edia/atomisp/pci/sh_css.c index 0e848758723f..8c368940acd8 100644 --- a/drivers/staging/media/atomisp/pci/sh_css.c +++ b/drivers/staging/media/atomisp/pci/sh_css.c @@ -8198,26 +8198,25 @@ static void ia_css_stream_destroy_isp2401(struct ia= _css_stream *stream) unsigned int sp_thread_id; struct sh_css_sp_pipeline_terminal *terminal; =20 - assert(entry); - if (entry) { - if (!ia_css_pipeline_get_sp_thread_id( + if (!entry) + continue; + + if (!ia_css_pipeline_get_sp_thread_id( ia_css_pipe_get_pipe_num(entry), &sp_thread_id)) - return; + continue; =20 - terminal =3D &sh_css_sp_group.pipe_io[sp_thread_id].input; + terminal =3D &sh_css_sp_group.pipe_io[sp_thread_id].input; =20 - for (j =3D 0; j < IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH; j++) { - ia_css_isys_stream_h isys_stream =3D - &terminal->context.virtual_input_system_stream[j]; - if (stream->config.isys_config[j].valid && isys_stream->valid) - ia_css_isys_stream_destroy(isys_stream); - } + for (j =3D 0; j < IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH; j++) { + ia_css_isys_stream_h isys_stream =3D + &terminal->context.virtual_input_system_stream[j]; + if (stream->config.isys_config[j].valid && isys_stream->valid) + ia_css_isys_stream_destroy(isys_stream); } } =20 if (stream->config.mode =3D=3D IA_CSS_INPUT_MODE_BUFFERED_SENSOR) { for (i =3D 0; i < stream->num_pipes; i++) { - struct ia_css_pipe *entry =3D stream->pipes[i]; /* * free any mipi frames that are remaining: * some test stream create-destroy cycles do @@ -8225,8 +8224,8 @@ static void ia_css_stream_destroy_isp2401(struct ia_c= ss_stream *stream) * and the mipi buffer is not freed in the * deque function */ - if (entry) - free_mipi_frames(entry); + if (stream->pipes[i]) + free_mipi_frames(stream->pipes[i]); } } stream_unregister_with_csi_rx(stream); --=20 2.53.0