From: Greg Kroah-Hartman Date: Fri, 10 Mar 2023 13:18:39 +0000 (+0100) Subject: 6.2-stable patches X-Git-Tag: v6.1.17~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddf9b91cea3c5354e800025b2eb5b2ef1ca4c105;p=thirdparty%2Fkernel%2Fstable-queue.git 6.2-stable patches added patches: usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch --- diff --git a/queue-6.2/series b/queue-6.2/series index 51314966e2a..a63a7594f74 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -208,3 +208,4 @@ drm-i915-dp_mst-fix-payload-removal-during-output-disabling.patch drm-i915-fix-system-suspend-without-fbdev-being-initialized.patch media-uvcvideo-fix-race-condition-with-usb_kill_urb.patch arm64-efi-make-efi_rt_lock-a-raw_spinlock.patch +usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch diff --git a/queue-6.2/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch b/queue-6.2/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch new file mode 100644 index 00000000000..a8f3996f4f7 --- /dev/null +++ b/queue-6.2/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 +Date: Mon, 13 Feb 2023 15:09:26 +0800 +Subject: usb: gadget: uvc: fix missing mutex_unlock() if kstrtou8() fails + +From: Yang Yingliang + +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 +Link: https://lore.kernel.org/r/20230213070926.776447-1-yangyingliang@huawei.com +Signed-off-by: Greg Kroah-Hartman +--- + 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);