Skip to contentSkip to conversation

media: rkisp1: Fix memory leaks

PATCH New Tomi Valkeinen 1 participant 3 messages Nov 22, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover media: rkisp1: Fix memory leaks

Fix two memory leaks in rkisp1 driver.

---
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,

Signature · 1 line
Tomi Valkeinen <[email protected]>
#1 lore raw

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")
---
 drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +5 -1
index c41abd2833f1..894d5afaff4e 100644
@@ -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);
 }
 
Signature · 1 line
2.34.1
#2 lore raw

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

In reply to Tomi Valkeinen

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

Fixes 2cce0a369dbd ("media: rkisp1: isp: Use V4L2 subdev active state")
---
 drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +1 -0
index 88ca8b2283b7..45d1ab96fc6e 100644
@@ -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);
 }
 
Signature · 1 line
2.34.1