media: bcm2835-unicam: Fix asc leaked in error/remove path
Subsystems (4)
PATCH 1/1 media: bcm2835-unicam: Fix asc leaked in error/remove path
v4l2_async_nf_add_fwnode_remote() allocates the asc, which is freed when v4l2_async_nf_cleanup() is called.
Call v4l2_async_nf_cleanup() properly in the driver paths.
Discovered with kmemleak after rmmod:
unreferenced object 0xffff000084526b80 (size 64):
comm "modprobe", pid 185, jiffies 4295013512
hex dump (first 32 bytes):
01 00 00 00 00 00 00 00 e8 0d ff bf 00 00 ff ff ................
40 83 bc 84 00 00 ff ff 60 83 bc 84 00 00 ff ff @.......`.......
backtrace (crc ac584083):
[<00000000ffb081a7>] kmemleak_alloc+0x38/0x44
[<00000000d2fd9301>] __kmalloc+0x1b0/0x250
[<000000004dd5354d>] __v4l2_async_nf_add_fwnode+0x28/0x9c
[<0000000067587657>] __v4l2_async_nf_add_fwnode_remote+0x3c/0x64--- drivers/media/platform/broadcom/bcm2835-unicam.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/broadcom/bcm2835-unicam.c +2 -0
@@ -2613,6 +2613,7 @@ static int unicam_async_nf_init(struct unicam_device *unicam)return 0 ; error: +v4l2_async_nf_cleanup (&unicam->notifier);fwnode_handle_put (ep_handle);return ret; }
@@ -2745,6 +2746,7 @@ static void unicam_remove(struct platform_device *pdev)v4l2_device_unregister (&unicam->v4l2_dev);media_device_unregister (&unicam->mdev);v4l2_async_nf_unregister (&unicam->notifier); +v4l2_async_nf_cleanup (&unicam->notifier);unicam_subdev_cleanup (unicam);
---
base-commit: a87737435cfa134f9cdcc696ba3080759d04cf72
change-id: 20260609-bcmpiclean-69a8ee3192b0
Best regards,
Signature · 1 line
Eugen Hristev <[email protected]>
Quoted 18 lines · Eugen Hristev
v4l2_async_nf_add_fwnode_remote()allocates the asc, which is freed whenv4l2_async_nf_cleanup()is called.Call
v4l2_async_nf_cleanup()properly in the driver paths.Discovered with kmemleak after rmmod:
unreferenced object
0xffff000084526b80(size 64):
comm "modprobe", pid 185, jiffies 4295013512
hex dump (first 32 bytes):01 00 00 00 00 00 00 00 e8 0d ff bf 00 00 ff ff ................ 40 83 bc 84 00 00 ff ff 60 83 bc 84 00 00 ff ff @.......`....... backtrace (crc ac584083): [<00000000ffb081a7>] kmemleak_alloc+0x38/0x44 [<00000000d2fd9301>] __kmalloc+0x1b0/0x250 [<000000004dd5354d>] __v4l2_async_nf_add_fwnode+0x28/0x9c [<0000000067587657>] __v4l2_async_nf_add_fwnode_remote+0x3c/0x64
Quoted 2 lines
Fixes 392cd78d495f ("media: bcm2835-unicam: Add support for CCP2/CSI2 camera interface")Signed-off-by Eugen Hristev <[email protected]>
Quoted 28 lines
--- drivers/media/platform/broadcom/bcm2835-unicam.c | 2 ++ 1 file changed, 2 insertions(+)drivers/media/platform/broadcom/bcm2835-unicam.c +2
-1@@ -2613,6 +2613,7 @@ static int unicam_async_nf_init(struct unicam_device *unicam)return 0 ; error: +v4l2_async_nf_cleanup (&unicam->notifier);fwnode_handle_put (ep_handle);return ret; }@@ -2745,6 +2746,7 @@ static void unicam_remove(struct platform_device *pdev)v4l2_device_unregister (&unicam->v4l2_dev);media_device_unregister (&unicam->mdev);v4l2_async_nf_unregister (&unicam->notifier); +v4l2_async_nf_cleanup (&unicam->notifier);unicam_subdev_cleanup (unicam); ---base-commit:
a87737435cfa134f9cdcc696ba3080759d04cf72
change-id: 20260609-bcmpiclean-69a8ee3192b0
Signature · 3 lines
Regards, Laurent Pinchart