iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadget: uvc: fix missing mutex_unlock() if kstrtou8() fails

Browse Source 
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>
This commit is contained in:
Yang Yingliang 2023-02-13 15:09:26 +08:00 committed by Greg Kroah-Hartman
parent 1c7988d5c7
commit acf252c1f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/gadget/function/uvc_configfs.c
View File

@ -546,6 +546,10 @@ static ssize_t uvcg_default_output_b_source_id_store(struct config_item *item,
int result; int result;
u8 num; u8 num;
result = kstrtou8(page, 0, &num);
if (result)
return result;
mutex_lock(su_mutex); /* for navigating configfs hierarchy */ mutex_lock(su_mutex); /* for navigating configfs hierarchy */
opts_item = group->cg_item.ci_parent->ci_parent-> opts_item = group->cg_item.ci_parent->ci_parent->
@ -553,10 +557,6 @@ static ssize_t uvcg_default_output_b_source_id_store(struct config_item *item,
opts = to_f_uvc_opts(opts_item); opts = to_f_uvc_opts(opts_item);
cd = &opts->uvc_output_terminal; cd = &opts->uvc_output_terminal;
result = kstrtou8(page, 0, &num);
if (result)
return result;
mutex_lock(&opts->lock); mutex_lock(&opts->lock);
cd->bSourceID = num; cd->bSourceID = num;
mutex_unlock(&opts->lock); mutex_unlock(&opts->lock);