From: Greg Kroah-Hartman Date: Wed, 2 Sep 2020 07:39:41 +0000 (+0200) Subject: drop queue-4.19/media-davinci-vpif_capture-fix-potential-double-free.patch X-Git-Tag: v4.4.235~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6645ad77d3007847e211fb854d3d2477b9667875;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/media-davinci-vpif_capture-fix-potential-double-free.patch --- diff --git a/queue-4.19/media-davinci-vpif_capture-fix-potential-double-free.patch b/queue-4.19/media-davinci-vpif_capture-fix-potential-double-free.patch deleted file mode 100644 index 48030c69bdd..00000000000 --- a/queue-4.19/media-davinci-vpif_capture-fix-potential-double-free.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dfa558f977ff7a3fc5ebba8c47c00882ecede82b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Jul 2020 19:04:53 +0200 -Subject: media: davinci: vpif_capture: fix potential double free - -From: Evgeny Novikov - -[ 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 -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - 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 a96f53ce80886..cf1d11e6dd8c4 100644 ---- a/drivers/media/platform/davinci/vpif_capture.c -+++ b/drivers/media/platform/davinci/vpif_capture.c -@@ -1489,8 +1489,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 - diff --git a/queue-4.19/series b/queue-4.19/series index 17c419ea184..32b86deb5ec 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -44,7 +44,6 @@ scsi-iscsi-do-not-put-host-in-iscsi_set_flashnode_pa.patch ceph-fix-potential-mdsc-use-after-free-crash.patch scsi-fcoe-memory-leak-fix-in-fcoe_sysfs_fcf_del.patch edac-ie31200-fallback-if-host-bridge-device-is-alrea.patch -media-davinci-vpif_capture-fix-potential-double-free.patch kvm-arm64-fix-symbol-dependency-in-__hyp_call_panic_.patch powerpc-spufs-add-config_coredump-dependency.patch usb-sisusbvga-fix-a-potential-ub-casued-by-left-shif.patch