2023-11-22 15:51:47

by Tomi Valkeinen

Subject: [PATCH v2 0/2] media: rkisp1: Fix memory leaks

Fix two memory leaks in rkisp1 driver.

Signed-off-by: Tomi Valkeinen <[email protected]>
---
Changes in v2:
- Fix error path code for rkisp1_probe()
- Add Rbs
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Tomi Valkeinen (2):
media: rkisp1: Fix media device memory leak
media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()

drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +++++-
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
---
base-commit: 1865913dd590ca6d5e3207b15099a1210dd62f29
change-id: 20231122-rkisp-fixes-c2795cafda52

Best regards,
--
Tomi Valkeinen <[email protected]>

2023-11-22 15:52:44

by Tomi Valkeinen

Subject: [PATCH v2 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()

Add missing call to v4l2_subdev_cleanup() to fix memory leak.

Fixes: 2cce0a369dbd ("media: rkisp1: isp: Use V4L2 subdev active state")
Reviewed-by: Tommaso Merciai <[email protected]>
Reviewed-by: Laurent Pinchart <[email protected]>
Signed-off-by: Tomi Valkeinen <[email protected]>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 88ca8b2283b7..45d1ab96fc6e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -933,6 +933,7 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)
return;

v4l2_device_unregister_subdev(&isp->sd);
+ v4l2_subdev_cleanup(&isp->sd);
media_entity_cleanup(&isp->sd.entity);
}


--
2.34.1

2023-11-22 16:12:57

by Tomi Valkeinen

Subject: [PATCH v2 1/2] media: rkisp1: Fix media device memory leak

Add missing calls to media_device_cleanup() to fix memory leak.

Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
Reviewed-by: Laurent Pinchart <[email protected]>
Reviewed-by: Tommaso Merciai <[email protected]>
Signed-off-by: Tomi Valkeinen <[email protected]>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index c41abd2833f1..894d5afaff4e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -582,7 +582,7 @@ static int rkisp1_probe(struct platform_device *pdev)

ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev);
if (ret)
- goto err_pm_runtime_disable;
+ goto err_media_dev_cleanup;

ret = media_device_register(&rkisp1->media_dev);
if (ret) {
@@ -617,6 +617,8 @@ static int rkisp1_probe(struct platform_device *pdev)
media_device_unregister(&rkisp1->media_dev);
err_unreg_v4l2_dev:
v4l2_device_unregister(&rkisp1->v4l2_dev);
+err_media_dev_cleanup:
+ media_device_cleanup(&rkisp1->media_dev);
err_pm_runtime_disable:
pm_runtime_disable(&pdev->dev);
return ret;
@@ -637,6 +639,8 @@ static void rkisp1_remove(struct platform_device *pdev)
media_device_unregister(&rkisp1->media_dev);
v4l2_device_unregister(&rkisp1->v4l2_dev);

+ media_device_cleanup(&rkisp1->media_dev);
+
pm_runtime_disable(&pdev->dev);
}


--
2.34.1