github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: media: atomisp: improve cleanup robustness in ia_css_stream_destroy_isp2401()

Browse Source 
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>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Jose A. Perez de Azpillaga 2026-03-26 22:34:09 +01:00 committed by Sakari Ailus
parent d133bd6ac9
commit f14d52b67e
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/media/atomisp/pci/sh_css.c
View File

@ -8196,26 +8196,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
@ -8223,8 +8222,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);