From: Greg Kroah-Hartman Date: Mon, 6 Sep 2021 08:59:44 +0000 (+0200) Subject: 5.14-stable patches X-Git-Tag: v5.10.63~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d780b89f6106304e6b0499f6919bcbb17e1fada2;p=thirdparty%2Fkernel%2Fstable-queue.git 5.14-stable patches added patches: media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch --- diff --git a/queue-5.14/media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch b/queue-5.14/media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch new file mode 100644 index 00000000000..5bdd1a7bdde --- /dev/null +++ b/queue-5.14/media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch @@ -0,0 +1,49 @@ +From 514e97674400462cc09c459a1ddfb9bf39017223 Mon Sep 17 00:00:00 2001 +From: Pavel Skripkin +Date: Wed, 7 Jul 2021 19:54:30 +0200 +Subject: media: stkwebcam: fix memory leak in stk_camera_probe + +From: Pavel Skripkin + +commit 514e97674400462cc09c459a1ddfb9bf39017223 upstream. + +My local syzbot instance hit memory leak in usb_set_configuration(). +The problem was in unputted usb interface. In case of errors after +usb_get_intf() the reference should be putted to correclty free memory +allocated for this interface. + +Fixes: ec16dae5453e ("V4L/DVB (7019): V4L: add support for Syntek DC1125 webcams") +Cc: stable@vger.kernel.org +Signed-off-by: Pavel Skripkin +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/stkwebcam/stk-webcam.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/media/usb/stkwebcam/stk-webcam.c ++++ b/drivers/media/usb/stkwebcam/stk-webcam.c +@@ -1346,7 +1346,7 @@ static int stk_camera_probe(struct usb_i + if (!dev->isoc_ep) { + pr_err("Could not find isoc-in endpoint\n"); + err = -ENODEV; +- goto error; ++ goto error_put; + } + dev->vsettings.palette = V4L2_PIX_FMT_RGB565; + dev->vsettings.mode = MODE_VGA; +@@ -1359,10 +1359,12 @@ static int stk_camera_probe(struct usb_i + + err = stk_register_video_device(dev); + if (err) +- goto error; ++ goto error_put; + + return 0; + ++error_put: ++ usb_put_intf(interface); + error: + v4l2_ctrl_handler_free(hdl); + v4l2_device_unregister(&dev->v4l2_dev); diff --git a/queue-5.14/series b/queue-5.14/series index d3dbc010dc6..d8cb4bede5a 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -11,3 +11,4 @@ alsa-usb-audio-fix-regression-on-sony-walkman-nw-a45-dac.patch alsa-hda-realtek-workaround-for-conflicting-ssid-on-asus-rog-strix-g17.patch alsa-pcm-fix-divide-error-in-snd_pcm_lib_ioctl.patch alsa-usb-audio-work-around-for-xrun-with-low-latency-playback.patch +media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch