media: aspeed-video: Fix memory leaks in aspeed_video_probe
Subsystems (3)
PATCH 1/1 media: aspeed-video: Fix memory leaks in aspeed_video_probe
In the implementation of aspeed_video_probe() the allocated memory for video should be released in case of failure. Release video if either devm_ioremap_resource() or aspeed_video_init() or aspeed_video_setup_video() fails.
--- drivers/media/platform/aspeed-video.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/media/platform/aspeed-video.c +10 -4
@@ -1663,18 +1663,24 @@ static int aspeed_video_probe(struct platform_device *pdev) video->base =devm_ioremap_resource (video->dev, res); -if (IS_ERR (video->base)) -return PTR_ERR (video->base); +if (IS_ERR (video->base)) { + rc =PTR_ERR (video->base); + goto free_video; + } rc =aspeed_video_init (video);if (rc) -return rc; + goto free_video; rc =aspeed_video_setup_video (video);if (rc) -return rc; + goto free_video;return 0 ; + +free_video: +kfree (video); +return rc; }static int aspeed_video_remove (struct platform_device *pdev)
Signature · 1 line
2.17.1
…
Quoted 2 lines
+++
b/drivers/media/platform/aspeed-video.c(quoted diff) +0
-0@@ -1663,18 +1663,24 @@ static int aspeed_video_probe(struct platform_device *pdev)
…
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1682
Quoted 2 lines
drivers/media/platform/aspeed-video.c +2
-0+free_video: +kfree (video);
…
I am curious if there is a need for such a memory release at another place. How do you think about to add this function call also to the implementation of the function “aspeed_video_remove”?
Regards,
Markus
Hi Navid,
Quoted 35 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released in case of failure. Release video if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails.Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>--- drivers/media/platform/aspeed-video.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)drivers/media/platform/aspeed-video.c +5
-4@@ -1663,18 +1663,24 @@ static int aspeed_video_probe(struct platform_device *pdev) video->base =devm_ioremap_resource (video->dev, res); -if (IS_ERR (video->base)) -return PTR_ERR (video->base); +if (IS_ERR (video->base)) { + rc =PTR_ERR (video->base); + goto free_video; + } rc =aspeed_video_init (video);if (rc) -return rc; + goto free_video; rc =aspeed_video_setup_video (video);if (rc) -return rc;
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1686
Quoted 10 lines
drivers/media/platform/aspeed-video.c +5
-0+ goto free_video;return 0 ; + +free_video: +kfree (video); +return rc; }static int aspeed_video_remove (struct platform_device *pdev)
Can we simply change kzalloc in aspeed_video_probe with devm_kzalloc so that we don't need to take care of freeing of video? I think it would be more simpler.
Cheers,
Jae
Quoted 47 lines · Jae Hyun Yoo
Hi Navid,
Quoted 43 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released in case of failure. Release video if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails.Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>--- drivers/media/platform/aspeed-video.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)drivers/media/platform/aspeed-video.c +10
-4@@ -1663,18 +1663,24 @@ static int aspeed_video_probe(struct platform_device *pdev) video->base =devm_ioremap_resource (video->dev, res); -if (IS_ERR (video->base)) -return PTR_ERR (video->base); +if (IS_ERR (video->base)) { + rc =PTR_ERR (video->base); + goto free_video; + } rc =aspeed_video_init (video);if (rc) -return rc; + goto free_video; rc =aspeed_video_setup_video (video);if (rc) -return rc; + goto free_video;return 0 ; + +free_video: +kfree (video); +return rc; }
Quoted 6 lines
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1686
Quoted 2 lines
drivers/media/platform/aspeed-video.c +0
-0static int aspeed_video_remove (struct platform_device *pdev)Can we simply change kzalloc in
aspeed_video_probewithdevm_kzallocso that we don't need to take care of freeing of video? I think it would be more simpler.
Sounds a neat plan, will send v2.
Quoted 4 lines
Cheers,
Jae
Signature · 1 line
Navid.
PATCH v2 1/1 media: aspeed-video: Fix memory leaks in aspeed_video_probe
In reply to Jae Hyun YooIn the implementation of aspeed_video_probe() the allocated memory for video should be released if either devm_ioremap_resource() or aspeed_video_init() or aspeed_video_setup_video() fails. Replace kzalloc() with devm_kzalloc to avoid explicit release for video.
---
Changes in v2:
-- replace kzalloc with devm_kzalloc based on Jae Hyun Yoo
suggestion
drivers/media/platform/aspeed-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/aspeed-video.c +1 -1
@@ -1646,7 +1646,7 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video =devm_kzalloc (sizeof (*video),GFP_KERNEL );if (!video)return -ENOMEM ;
Signature · 1 line
2.17.1
Quoted 20 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails. Replacekzalloc()withdevm_kzallocto avoid explicit release for video.Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>---
Changes in v2:
-- replace kzalloc withdevm_kzallocbased on Jae Hyun Yoo
suggestiondrivers/media/platform/aspeed-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/aspeed-video.c +0
-0
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1649
Quoted 5 lines
drivers/media/platform/aspeed-video.c +1
-1@@ -1646,7 +1646,7 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video =devm_kzalloc (sizeof (*video),GFP_KERNEL );
It can't be compiled. devm_kzalloc should have 3 parameters.
Cheers,
Jae
Quoted 17 lines · Jae Hyun Yoo
Quoted 15 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails. Replacekzalloc()withdevm_kzallocto avoid explicit release for video.Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>---
Changes in v2:
-- replace kzalloc withdevm_kzallocbased on Jae Hyun Yoo
suggestiondrivers/media/platform/aspeed-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1649
Quoted 10 lines
drivers/media/platform/aspeed-video.c +1
-1@@ -1646,7 +1646,7 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video =devm_kzalloc (sizeof (*video),GFP_KERNEL );It can't be compiled.
devm_kzallocshould have 3 parameters.
Oops! my bad. Do you think such a list of parameters is fine:
devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL);
Quoted 3 lines
Cheers,
Jae
Signature · 1 line
Navid.
Quoted 33 lines · Navid Emamdoost
Quoted 17 lines · Jae Hyun Yoo
Quoted 15 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails. Replacekzalloc()withdevm_kzallocto avoid explicit release for video.Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>---
Changes in v2:
-- replace kzalloc withdevm_kzallocbased on Jae Hyun Yoo
suggestiondrivers/media/platform/aspeed-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 13 lines
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1649
Quoted 10 lines
drivers/media/platform/aspeed-video.c +1
-1@@ -1646,7 +1646,7 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video =devm_kzalloc (sizeof (*video),GFP_KERNEL );It can't be compiled.
devm_kzallocshould have 3 parameters.
Quoted 2 lines
Oops! my bad. Do you think such a list of parameters is fine:
devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL);
Yes, it's fine.
PATCH v3 1/1 media: aspeed-video: Fix memory leaks in aspeed_video_probe
In the implementation of aspeed_video_probe() the allocated memory for video should be released if either devm_ioremap_resource() or aspeed_video_init() or aspeed_video_setup_video() fails. Replace kzalloc() with devm_kzalloc to avoid explicit release for video.
---
Changes in v3:
-- fix call to devm_kzalloc()
--- drivers/media/platform/aspeed-video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/aspeed-video.c +2 -1
@@ -1646,7 +1646,8 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video = +devm_kzalloc (&pdev->dev,sizeof (*video),GFP_KERNEL );if (!video)return -ENOMEM ;
Signature · 1 line
2.17.1
Quoted 10 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails. Replacekzalloc()withdevm_kzallocto avoid explicit release for video.Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>---
Changes in v3:
-- fix call todevm_kzalloc()
Better keep all change history at here.
Quoted 9 lines
--- drivers/media/platform/aspeed-video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/platform/aspeed-video.c +0
-0
drivers/media/platform/aspeed-video.c static int aspeed_video_probe(struct platform_device *pdev) · line 1650
Quoted 6 lines
drivers/media/platform/aspeed-video.c +2
-1@@ -1646,7 +1646,8 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video = +devm_kzalloc (&pdev->dev,sizeof (*video),GFP_KERNEL );
For a case of assignment in definition section, let it go over the 80 chars.
With this fixed:
Quoted 3 lines
drivers/media/platform/aspeed-video.c +0
-0if (!video)return -ENOMEM ;
Quoted 4 lines · Navid Emamdoost
In the implementation of
aspeed_video_probe()the allocated memory for video should be released if eitherdevm_ioremap_resource()oraspeed_video_init()oraspeed_video_setup_video()fails. Replacekzalloc()withdevm_kzallocto avoid explicit release for video.
Thanks,
Quoted 24 lines
Fixes d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")Signed-off-by Navid Emamdoost <[email protected]>---
Changes in v3:
-- fix call todevm_kzalloc()--- drivers/media/platform/aspeed-video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/platform/aspeed-video.c +2
-1@@ -1646,7 +1646,8 @@ static int aspeed_video_probe(struct platform_device *pdev) {int rc;struct resource *res; -struct aspeed_video *video =kzalloc (sizeof (*video),GFP_KERNEL ); +struct aspeed_video *video = +devm_kzalloc (&pdev->dev,sizeof (*video),GFP_KERNEL );if (!video)return -ENOMEM ;