media: davinci: vpif_capture: fix potential double free

602649ea · Evgeny Novikov <[email protected]> · 2020-07-23 19:04:53 +02:00

In case of errors vpif_probe_complete() releases memory for vpif_obj.sd
and unregisters the V4L2 device. But then this is done again by
vpif_probe() itself. The patch removes the cleaning from
vpif_probe_complete().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Evgeny Novikov <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

Commit: 602649eadaa0c977e362e641f51ec306bc1d365d
Parents: 670f7ef5

Changes

1 files changed · +0 −2

File	Status	Add	Del	Content
drivers/media/platform/davinci/vpif_capture.c	modified	+0	−2	View file

drivers/media/platform/davinci/vpif_capture.c

View file

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index d9ec439..72a0e94 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1482,8 +1482,6 @@ probe_out:
 		/* Unregister video device */
 		video_unregister_device(&ch->video_dev);
 	}
-	kfree(vpif_obj.sd);
-	v4l2_device_unregister(&vpif_obj.v4l2_dev);
 
 	return err;
 }