xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: davinci: vpif_capture: fix memory leak in vpif_probe()

Browse Source 
If vpif_probe() fails on v4l2_device_register() and vpif_probe_complete(),
then memory allocated at initialize_vpif() for global vpif_obj.dev[i]
become unreleased.

The patch adds deallocation of vpif_obj.dev[i] on the error path.

Signed-off-by: Young Xiao <92siuyang@gmail.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Young Xiao
2019-06-04 08:26:33 -04:00
committed by Mauro Carvalho Chehab
parent 3510c68d32
commit 64f883cd98
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/davinci/vpif_capture.c
View File

@@ -1376,6 +1376,14 @@ vpif_init_free_channel_objects:
return err; return err;
} }
static inline void free_vpif_objs(void)
{
int i;
for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++)
kfree(vpif_obj.dev[i]);
}
static int vpif_async_bound(struct v4l2_async_notifier *notifier, static int vpif_async_bound(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev, struct v4l2_subdev *subdev,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
@@ -1645,7 +1653,7 @@ static __init int vpif_probe(struct platform_device *pdev)
err = v4l2_device_register(vpif_dev, &vpif_obj.v4l2_dev); err = v4l2_device_register(vpif_dev, &vpif_obj.v4l2_dev);
if (err) { if (err) {
v4l2_err(vpif_dev->driver, "Error registering v4l2 device\n"); v4l2_err(vpif_dev->driver, "Error registering v4l2 device\n");
goto cleanup; goto vpif_free;
} }
while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) { while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
@@ -1692,7 +1700,9 @@ static __init int vpif_probe(struct platform_device *pdev)
"registered sub device %s\n", "registered sub device %s\n",
subdevdata->name); subdevdata->name);
} }
vpif_probe_complete(); err = vpif_probe_complete();
if (err)
goto probe_subdev_out;
} else { } else {
vpif_obj.notifier.ops = &vpif_async_ops; vpif_obj.notifier.ops = &vpif_async_ops;
err = v4l2_async_notifier_register(&vpif_obj.v4l2_dev, err = v4l2_async_notifier_register(&vpif_obj.v4l2_dev,
@@ -1711,6 +1721,8 @@ probe_subdev_out:
kfree(vpif_obj.sd); kfree(vpif_obj.sd);
vpif_unregister: vpif_unregister:
v4l2_device_unregister(&vpif_obj.v4l2_dev); v4l2_device_unregister(&vpif_obj.v4l2_dev);
vpif_free:
free_vpif_objs();
cleanup: cleanup:
v4l2_async_notifier_cleanup(&vpif_obj.notifier); v4l2_async_notifier_cleanup(&vpif_obj.notifier);