From: "Jose A. Perez de Azpillaga" <azpijr@gmail.com>
To: linux-staging@lists.linux.dev
Cc: Hans de Goede <hansg@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Andy Shevchenko <andy@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kees Cook <kees@kernel.org>,
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 [thread overview]
Message-ID: <20260326213442.876745-4-azpijr@gmail.com> (raw)
In-Reply-To: <20260326213442.876745-1-azpijr@gmail.com>
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 <azpijr@gmail.com>
---
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/media/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;
- 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;
- terminal = &sh_css_sp_group.pipe_io[sp_thread_id].input;
+ terminal = &sh_css_sp_group.pipe_io[sp_thread_id].input;
- for (j = 0; j < IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH; j++) {
- ia_css_isys_stream_h isys_stream =
- &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 = 0; j < IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH; j++) {
+ ia_css_isys_stream_h isys_stream =
+ &terminal->context.virtual_input_system_stream[j];
+ if (stream->config.isys_config[j].valid && isys_stream->valid)
+ ia_css_isys_stream_destroy(isys_stream);
}
}
if (stream->config.mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR) {
for (i = 0; i < stream->num_pipes; i++) {
- struct ia_css_pipe *entry = 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_css_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);
--
2.53.0
next prev parent reply other threads:[~2026-03-26 21:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-26 21:34 [PATCH v2 0/3] staging: media: atomisp: clean up ia_css_stream_destroy Jose A. Perez de Azpillaga
2026-03-26 21:34 ` [PATCH v2 1/3] staging: media: atomisp: fix loop shadowing in ia_css_stream_destroy() Jose A. Perez de Azpillaga
2026-03-26 21:34 ` [PATCH v2 2/3] staging: media: atomisp: extract ISP2401 cleanup into helper function Jose A. Perez de Azpillaga
2026-03-26 21:34 ` Jose A. Perez de Azpillaga [this message]
2026-03-27 7:48 ` [PATCH v2 0/3] staging: media: atomisp: clean up ia_css_stream_destroy Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260326213442.876745-4-azpijr@gmail.com \
--to=azpijr@gmail.com \
--cc=andy@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox