media: nuvoton: npcm-video: fix error handling in npcm_video_init()
Subsystems (2)
PATCH 1/2 media: nuvoton: npcm-video: fix error handling in npcm_video_init()
npcm_video_init() has two error handling issues after of_reserved_mem_device_init() is called:
When dma_set_mask_and_coherent() fails, the function releases the reserved memory but does not return, allowing execution to fall through into npcm_video_ece_init() with a failed DMA configuration.
When npcm_video_ece_init() fails, the function returns an error without calling of_reserved_mem_device_release(), leaking the reserved memory association.
Fix both by adding the missing return after the DMA mask failure and adding the missing of_reserved_mem_device_release() call on the ECE init error path.
--- drivers/media/platform/nuvoton/npcm-video.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/nuvoton/npcm-video.c +2 -0
@@ -1720,10 +1720,12 @@ static int npcm_video_init(struct npcm_video *video)if (rc) {dev_err (dev,"Failed to set DMA mask\n" );of_reserved_mem_device_release (dev); +return rc; } rc =npcm_video_ece_init (video);if (rc) { +of_reserved_mem_device_release (dev);dev_err (dev,"Failed to initialize ECE\n" );return rc; }
Signature · 1 line
2.53.0
PATCH 2/2 media: nuvoton: npcm-video: fix memory leaks in probe and remove
npcm_video_probe() allocates the npcm_video structure with kzalloc_obj() but never frees it on any probe error path or in npcm_video_remove(), leaking the allocation on every failed probe and every normal unbind.
Additionally, when npcm_video_setup_video() fails, the reserved memory association established by of_reserved_mem_device_init() in npcm_video_init() is not released, leaking the rmem_assigned_device entry on the global list.
Fix both by adding kfree(video) to all probe error paths and to npcm_video_remove(), and adding the missing of_reserved_mem_device_release() call when npcm_video_setup_video() fails.
--- drivers/media/platform/nuvoton/npcm-video.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/media/platform/nuvoton/npcm-video.c +17 -4
@@ -1749,6 +1749,7 @@ static int npcm_video_probe(struct platform_device *pdev) regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (regs)) { +kfree (video);dev_err (&pdev->dev,"Failed to parse VCD reg in DTS\n" );return PTR_ERR (regs); }
@@ -1756,33 +1757,44 @@ static int npcm_video_probe(struct platform_device *pdev) video->vcd_regmap =devm_regmap_init_mmio (&pdev->dev, regs, &npcm_video_regmap_cfg);if (IS_ERR (video->vcd_regmap)) { +kfree (video);dev_err (&pdev->dev,"Failed to initialize VCD regmap\n" );return PTR_ERR (video->vcd_regmap); } video->reset =devm_reset_control_get (&pdev->dev,NULL );if (IS_ERR (video->reset)) { +kfree (video);dev_err (&pdev->dev,"Failed to get VCD reset control in DTS\n" );return PTR_ERR (video->reset); } video->gcr_regmap =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"nuvoton,sysgcr" ); -if (IS_ERR (video->gcr_regmap)) +if (IS_ERR (video->gcr_regmap)) { +kfree (video);return PTR_ERR (video->gcr_regmap); + } video->gfx_regmap =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"nuvoton,sysgfxi" ); -if (IS_ERR (video->gfx_regmap)) +if (IS_ERR (video->gfx_regmap)) { +kfree (video);return PTR_ERR (video->gfx_regmap); + } rc =npcm_video_init (video); -if (rc) +if (rc) { +kfree (video);return rc; + } rc =npcm_video_setup_video (video); -if (rc) +if (rc) { +of_reserved_mem_device_release (&pdev->dev); +kfree (video);return rc; + }dev_info (video->dev,"NPCM video driver probed\n" );return 0 ;
@@ -1800,6 +1812,7 @@ static void npcm_video_remove(struct platform_device *pdev)v4l2_device_unregister (v4l2_dev);if (video->ece.enable)npcm_video_ece_stop (video); +kfree (video);of_reserved_mem_device_release (dev); }
Signature · 1 line
2.53.0
PATCH v2 2/2 media: nuvoton: npcm-video: fix memory leaks in probe and remove
npcm_video_probe() allocates the npcm_video structure with kzalloc_obj() but never frees it on any probe error path or in npcm_video_remove(), leaking the allocation on every failed probe and every normal unbind.
Additionally, when npcm_video_setup_video() fails, the reserved memory association established by of_reserved_mem_device_init() in npcm_video_init() is not released, leaking the rmem_assigned_device entry on the global list.
Fix both by adding kfree(video) to all probe error paths and to npcm_video_remove(), and adding the missing of_reserved_mem_device_release() call when npcm_video_setup_video() fails.
--- drivers/media/platform/nuvoton/npcm-video.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/media/platform/nuvoton/npcm-video.c +17 -4
@@ -1749,6 +1749,7 @@ static int npcm_video_probe(struct platform_device *pdev) regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (regs)) { +kfree (video);dev_err (&pdev->dev,"Failed to parse VCD reg in DTS\n" );return PTR_ERR (regs); }
@@ -1756,33 +1757,44 @@ static int npcm_video_probe(struct platform_device *pdev) video->vcd_regmap =devm_regmap_init_mmio (&pdev->dev, regs, &npcm_video_regmap_cfg);if (IS_ERR (video->vcd_regmap)) { +kfree (video);dev_err (&pdev->dev,"Failed to initialize VCD regmap\n" );return PTR_ERR (video->vcd_regmap); } video->reset =devm_reset_control_get (&pdev->dev,NULL );if (IS_ERR (video->reset)) { +kfree (video);dev_err (&pdev->dev,"Failed to get VCD reset control in DTS\n" );return PTR_ERR (video->reset); } video->gcr_regmap =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"nuvoton,sysgcr" ); -if (IS_ERR (video->gcr_regmap)) +if (IS_ERR (video->gcr_regmap)) { +kfree (video);return PTR_ERR (video->gcr_regmap); + } video->gfx_regmap =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"nuvoton,sysgfxi" ); -if (IS_ERR (video->gfx_regmap)) +if (IS_ERR (video->gfx_regmap)) { +kfree (video);return PTR_ERR (video->gfx_regmap); + } rc =npcm_video_init (video); -if (rc) +if (rc) { +kfree (video);return rc; + } rc =npcm_video_setup_video (video); -if (rc) +if (rc) { +of_reserved_mem_device_release (&pdev->dev); +kfree (video);return rc; + }dev_info (video->dev,"NPCM video driver probed\n" );return 0 ;
@@ -1800,6 +1812,7 @@ static void npcm_video_remove(struct platform_device *pdev)v4l2_device_unregister (v4l2_dev);if (video->ece.enable)npcm_video_ece_stop (video); +kfree (video);of_reserved_mem_device_release (dev); }
Signature · 1 line
2.53.0
PATCH v2 1/2 media: nuvoton: npcm-video: fix error handling in npcm_video_init()
In reply to David Carliernpcm_video_init() has two error handling issues after of_reserved_mem_device_init() is called:
When dma_set_mask_and_coherent() fails, the function releases the reserved memory but does not return, allowing execution to fall through into npcm_video_ece_init() with a failed DMA configuration.
When npcm_video_ece_init() fails, the function returns an error without calling of_reserved_mem_device_release(), leaking the reserved memory association.
Fix both by adding the missing return after the DMA mask failure and adding the missing of_reserved_mem_device_release() call on the ECE init error path.
--- drivers/media/platform/nuvoton/npcm-video.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/nuvoton/npcm-video.c +2 -0
@@ -1720,10 +1720,12 @@ static int npcm_video_init(struct npcm_video *video)if (rc) {dev_err (dev,"Failed to set DMA mask\n" );of_reserved_mem_device_release (dev); +return rc; } rc =npcm_video_ece_init (video);if (rc) { +of_reserved_mem_device_release (dev);dev_err (dev,"Failed to initialize ECE\n" );return rc; }
Signature · 1 line
2.53.0