tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit 609ba05b9484856b08869f827a6edee51d51b5f3 upstream.

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

Fixes: a1e2940458 ("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>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Haoxiang Li
2025-02-26 20:49:22 +08:00
committed by Greg Kroah-Hartman
parent 1f78790d98
commit 2a2bd7df40
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/imagination/e5010-jpeg-enc.c
+7 -2
View File
@@ -1057,8 +1057,11 @@ static int e5010_probe(struct platform_device *pdev)
e5010->vdev->lock = &e5010->mutex; e5010->vdev->lock = &e5010->mutex;
ret = v4l2_device_register(dev, &e5010->v4l2_dev); ret = v4l2_device_register(dev, &e5010->v4l2_dev);
if (ret) if (ret) {
return dev_err_probe(dev, ret, "failed to register v4l2 device\n"); 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); e5010->m2m_dev = v4l2_m2m_init(&e5010_m2m_ops);
if (IS_ERR(e5010->m2m_dev)) { if (IS_ERR(e5010->m2m_dev)) {
@@ -1118,6 +1121,8 @@ fail_after_video_register_device:
v4l2_m2m_release(e5010->m2m_dev); v4l2_m2m_release(e5010->m2m_dev);
fail_after_v4l2_register: fail_after_v4l2_register:
v4l2_device_unregister(&e5010->v4l2_dev); v4l2_device_unregister(&e5010->v4l2_dev);
fail_after_video_device_alloc:
video_device_release(e5010->vdev);
return ret; return ret;
} }