media: imagination: fix a potential memory leak in e5010_probe()

[PATCH] media: imagination: fix a potential memory leak in e5010_probe()

Posted by Haoxiang Li 9 months, 3 weeks ago

Add video_device_release() to release the memory allocated by
video_device_alloc() if something goes wrong.

Fixes: a1e294045885 ("media: imagination: Add E5010 JPEG Encoder driver")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>
---
 drivers/media/platform/imagination/e5010-jpeg-enc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/imagination/e5010-jpeg-enc.c b/drivers/media/platform/imagination/e5010-jpeg-enc.c
index c194f830577f..53e501b5ac0a 100644
--- a/drivers/media/platform/imagination/e5010-jpeg-enc.c
+++ b/drivers/media/platform/imagination/e5010-jpeg-enc.c
@@ -1057,8 +1057,11 @@ static int e5010_probe(struct platform_device *pdev)
 	e5010->vdev->lock = &e5010->mutex;
 
 	ret = v4l2_device_register(dev, &e5010->v4l2_dev);
-	if (ret)
-		return dev_err_probe(dev, ret, "failed to register v4l2 device\n");
+	if (ret) {
+		dev_err_probe(dev, ret, "failed to register v4l2 device\n");
+		goto fail_after_video_device_alloc;
+	}
+
 
 	e5010->m2m_dev = v4l2_m2m_init(&e5010_m2m_ops);
 	if (IS_ERR(e5010->m2m_dev)) {
@@ -1118,6 +1121,8 @@ static int e5010_probe(struct platform_device *pdev)
 	v4l2_m2m_release(e5010->m2m_dev);
 fail_after_v4l2_register:
 	v4l2_device_unregister(&e5010->v4l2_dev);
+fail_after_video_device_alloc:
+	video_device_release(e5010->vdev);
 	return ret;
 }
 
-- 
2.25.1

Re: [PATCH] media: imagination: fix a potential memory leak in e5010_probe()

Posted by Nicolas Dufresne 7 months, 4 weeks ago

Hi,

Le mercredi 26 février 2025 à 20:49 +0800, Haoxiang Li a écrit :
> Add video_device_release() to release the memory allocated by
> video_device_alloc() if something goes wrong.
> 
> Fixes: a1e294045885 ("media: imagination: Add E5010 JPEG Encoder driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

> ---
>  drivers/media/platform/imagination/e5010-jpeg-enc.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/imagination/e5010-jpeg-enc.c b/drivers/media/platform/imagination/e5010-jpeg-enc.c
> index c194f830577f..53e501b5ac0a 100644
> --- a/drivers/media/platform/imagination/e5010-jpeg-enc.c
> +++ b/drivers/media/platform/imagination/e5010-jpeg-enc.c
> @@ -1057,8 +1057,11 @@ static int e5010_probe(struct platform_device *pdev)
>  	e5010->vdev->lock = &e5010->mutex;
>  
>  	ret = v4l2_device_register(dev, &e5010->v4l2_dev);
> -	if (ret)
> -		return dev_err_probe(dev, ret, "failed to register v4l2 device\n");
> +	if (ret) {
> +		dev_err_probe(dev, ret, "failed to register v4l2 device\n");
> +		goto fail_after_video_device_alloc;
> +	}
> +
>  
>  	e5010->m2m_dev = v4l2_m2m_init(&e5010_m2m_ops);
>  	if (IS_ERR(e5010->m2m_dev)) {
> @@ -1118,6 +1121,8 @@ static int e5010_probe(struct platform_device *pdev)
>  	v4l2_m2m_release(e5010->m2m_dev);
>  fail_after_v4l2_register:
>  	v4l2_device_unregister(&e5010->v4l2_dev);
> +fail_after_video_device_alloc:
> +	video_device_release(e5010->vdev);
>  	return ret;
>  }
>