Commit 64f883cd authored by Young Xiao's avatar Young Xiao Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarYoung Xiao <92siuyang@gmail.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 3510c68d

drivers/media/platform/davinci/vpif_capture.c

+14 −2
Original line number Diff line number Diff line
@@ -1376,6 +1376,14 @@ static int initialize_vpif(void) 
	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,

			    struct v4l2_subdev *subdev,

			    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);

	if (err) {

		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))) {
@@ -1692,7 +1700,9 @@ static __init int vpif_probe(struct platform_device *pdev) 
				  "registered sub device %s\n",

				   subdevdata->name);

		}

		vpif_probe_complete();

		err = vpif_probe_complete();

		if (err)

			goto probe_subdev_out;

	} else {

		vpif_obj.notifier.ops = &vpif_async_ops;

		err = v4l2_async_notifier_register(&vpif_obj.v4l2_dev,
@@ -1711,6 +1721,8 @@ static __init int vpif_probe(struct platform_device *pdev) 
	kfree(vpif_obj.sd);

vpif_unregister:

	v4l2_device_unregister(&vpif_obj.v4l2_dev);

vpif_free:

	free_vpif_objs();

cleanup:

	v4l2_async_notifier_cleanup(&vpif_obj.notifier);