| From 73e9a6cc2028ca1e7f499cb9de44d8f2f54052cc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 23 Jul 2020 19:04:53 +0200 |
| Subject: media: davinci: vpif_capture: fix potential double free |
| |
| From: Evgeny Novikov <novikov@ispras.ru> |
| |
| [ Upstream commit 602649eadaa0c977e362e641f51ec306bc1d365d ] |
| |
| 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 <novikov@ispras.ru> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/davinci/vpif_capture.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c |
| index 5104cc0ee40e3..a3c4cc025ed6f 100644 |
| --- a/drivers/media/platform/davinci/vpif_capture.c |
| +++ b/drivers/media/platform/davinci/vpif_capture.c |
| @@ -1408,8 +1408,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; |
| } |
| -- |
| 2.25.1 |
| |
