On Tue Sep 29 15:37:29 2026 +0100, David Carlier wrote:
> ipu7_fw_isys_init() runs on every first stream start, but allocates the
> firmware context and queue configs with devm and never frees them, so
> each STREAMON/STREAMOFF cycle leaks them. Use kzalloc and free them in
> ipu7_fw_isys_cleanup().
>
> Fixes: 9ab793dbc176 ("media: ipu6: Add ipu7 fw isys ops")
> Signed-off-by: David Carlier <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu7-fw-isys.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
index 0876cc54faa7..a37897bda933 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
@@ -35,6 +35,8 @@ static void ipu7_fw_isys_cleanup(struct ipu6_isys *isys)
}
isys->fwctx = NULL;
+ kfree(fwctx->queue_configs);
+ kfree(fwctx);
}
static int ipu7_fw_isys_open(struct ipu6_isys *isys)
@@ -68,8 +70,7 @@ static int ipu7_fw_isys_init(struct ipu6_isys *isys, unsigned
int num_streams)
int ret;
/* Allocate and init firmware context. */
- fwctx = devm_kzalloc(dev, sizeof(struct ipu7_fw_com_context),
- GFP_KERNEL);
+ fwctx = kzalloc_obj(*fwctx);
if (!fwctx)
return -ENOMEM;
@@ -77,11 +78,10 @@ static int ipu7_fw_isys_init(struct ipu6_isys *isys,
unsigned int num_streams)
fwctx->num_output_queues = IPU7_INSYS_MAX_OUTPUT_QUEUES;
num_queues = fwctx->num_input_queues + fwctx->num_output_queues;
- queue_configs = devm_kcalloc(dev, num_queues, sizeof(*queue_configs),
- GFP_KERNEL);
+ queue_configs = kzalloc_objs(*queue_configs, num_queues);
if (!queue_configs) {
- ipu7_fw_isys_cleanup(isys);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_free_fwctx;
}
fwctx->fw_entry = adev->fw_entry;
fwctx->queue_configs = queue_configs;
@@ -112,8 +112,8 @@ static int ipu7_fw_isys_init(struct ipu6_isys *isys,
unsigned int num_streams)
&fw_config_dma_addr, GFP_KERNEL, 0);
if (!fw_config) {
dev_err(dev, "Failed to allocate isys subsys config.\n");
- ipu7_fw_isys_cleanup(isys);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_free_queue_configs;
}
fwctx->fw_config = fw_config;
fwctx->fw_config_dma_addr = fw_config_dma_addr;
@@ -145,6 +145,13 @@ static int ipu7_fw_isys_init(struct ipu6_isys *isys,
unsigned int num_streams)
ipu7_fw_isys_cleanup(isys);
return ret;
+
+err_free_queue_configs:
+ kfree(queue_configs);
+err_free_fwctx:
+ kfree(fwctx);
+
+ return ret;
}
static struct ipu7_insys_resp *ipu7_fw_isys_get_resp(struct ipu6_isys *isys)
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
