From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Sep 2021 08:58:53 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.10.63~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42d1711cba2fd0cd42fc09cad3e01f4551c503fc;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch
---

diff --git a/queue-5.4/media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch b/queue-5.4/media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch
new file mode 100644
index 00000000000..5bdd1a7bdde
--- /dev/null
+++ b/queue-5.4/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 <paskripkin@gmail.com>
+Date: Wed, 7 Jul 2021 19:54:30 +0200
+Subject: media: stkwebcam: fix memory leak in stk_camera_probe
+
+From: Pavel Skripkin <paskripkin@gmail.com>
+
+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 <paskripkin@gmail.com>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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.4/series b/queue-5.4/series
index b643ebaeb5a..5b1986505e3 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -18,3 +18,4 @@ arm-8918-2-only-build-return_address-if-needed.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
 arc-wireup-clone3-syscall.patch
+media-stkwebcam-fix-memory-leak-in-stk_camera_probe.patch