From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 10 Mar 2023 13:18:28 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.17~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a137de1e7c41824ea82c11a42f8b1cd3d737f0ea;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
index 4186260ed5f..d9389d61364 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -197,3 +197,4 @@ io_uring-poll-allow-some-retries-for-poll-triggering-spuriously.patch
 arm64-efi-make-efi_rt_lock-a-raw_spinlock.patch
 arm64-mte-fix-clarify-the-pg_mte_tagged-semantics.patch
 arm64-reset-kasan-tag-in-copy_highpage-with-hw-tags-only.patch
+usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch
diff --git a/queue-6.1/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch b/queue-6.1/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch
new file mode 100644
index 00000000000..a8f3996f4f7
--- /dev/null
+++ b/queue-6.1/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch
@@ -0,0 +1,45 @@
+From 7ebb605d2283fb2647b4fa82030307ce00bee436 Mon Sep 17 00:00:00 2001
+From: Yang Yingliang <yangyingliang@huawei.com>
+Date: Mon, 13 Feb 2023 15:09:26 +0800
+Subject: usb: gadget: uvc: fix missing mutex_unlock() if kstrtou8() fails
+
+From: Yang Yingliang <yangyingliang@huawei.com>
+
+commit 7ebb605d2283fb2647b4fa82030307ce00bee436 upstream.
+
+If kstrtou8() fails, the mutex_unlock() is missed, move kstrtou8()
+before mutex_lock() to fix it up.
+
+Fixes: 0525210c9840 ("usb: gadget: uvc: Allow definition of XUs in configfs")
+Fixes: b3c839bd8a07 ("usb: gadget: uvc: Make bSourceID read/write")
+Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
+Link: https://lore.kernel.org/r/20230213070926.776447-1-yangyingliang@huawei.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/gadget/function/uvc_configfs.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/usb/gadget/function/uvc_configfs.c
++++ b/drivers/usb/gadget/function/uvc_configfs.c
+@@ -524,6 +524,10 @@ static ssize_t uvcg_default_output_b_sou
+ 	int result;
+ 	u8 num;
+ 
++	result = kstrtou8(page, 0, &num);
++	if (result)
++		return result;
++
+ 	mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+ 
+ 	opts_item = group->cg_item.ci_parent->ci_parent->
+@@ -531,10 +535,6 @@ static ssize_t uvcg_default_output_b_sou
+ 	opts = to_f_uvc_opts(opts_item);
+ 	cd = &opts->uvc_output_terminal;
+ 
+-	result = kstrtou8(page, 0, &num);
+-	if (result)
+-		return result;
+-
+ 	mutex_lock(&opts->lock);
+ 	cd->bSourceID = num;
+ 	mutex_unlock(&opts->lock);