media: davinci: vpif_capture: fix potential double free

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]>

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index d9ec439faefa64577b7c21bd27176ff993906a70..72a0e94e2e21ad0ff2d93a129b3e3713273ddfa5 100644 (file)
--- 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;
 }