From: Dan Scally <dan.scally@ideasonboard.com>
To: Dan Carpenter <error27@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] usb: gadget: uvc: unlock on an error paths
Date: Thu, 16 Feb 2023 14:26:13 +0000 [thread overview]
Message-ID: <a3f5ec02-6e23-c3a6-3c5b-9413337615ec@ideasonboard.com> (raw)
In-Reply-To: <Y+4ehE7/GgnRZuo0@kili>
Thanks Dan. This one was tackled by Yang already actually:
https://lore.kernel.org/linux-usb/20230213070926.776447-1-yangyingliang@huawei.com/
On 16/02/2023 12:16, Dan Carpenter wrote:
> This code accidentally returns without dropping the "su_mutex" if
> kstrtou8() fails. It's probably better to just do the kstrtou8() before
> taking the lock.
>
> Fixes: b3c839bd8a07 ("usb: gadget: uvc: Make bSourceID read/write")
> Fixes: 0525210c9840 ("usb: gadget: uvc: Allow definition of XUs in configfs")
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> ---
> drivers/usb/gadget/function/uvc_configfs.c | 31 +++++++++++-----------
> 1 file changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
> index 18c6a1461b7e..a59c1a95bfcd 100644
> --- a/drivers/usb/gadget/function/uvc_configfs.c
> +++ b/drivers/usb/gadget/function/uvc_configfs.c
> @@ -590,6 +590,10 @@ static ssize_t uvcg_default_output_b_source_id_store(struct config_item *item,
> 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->
> @@ -597,10 +601,6 @@ static ssize_t uvcg_default_output_b_source_id_store(struct config_item *item,
> 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);
> @@ -707,15 +707,15 @@ static ssize_t uvcg_extension_b_num_controls_store(struct config_item *item,
> int ret;
> u8 num;
>
> + ret = kstrtou8(page, 0, &num);
> + if (ret)
> + return ret;
> +
> mutex_lock(su_mutex);
>
> opts_item = item->ci_parent->ci_parent->ci_parent;
> opts = to_f_uvc_opts(opts_item);
>
> - ret = kstrtou8(page, 0, &num);
> - if (ret)
> - return ret;
> -
> mutex_lock(&opts->lock);
> xu->desc.bNumControls = num;
> mutex_unlock(&opts->lock);
> @@ -742,14 +742,15 @@ static ssize_t uvcg_extension_b_nr_in_pins_store(struct config_item *item,
> int ret;
> u8 num;
>
> + ret = kstrtou8(page, 0, &num);
> + if (ret)
> + return ret;
> +
> mutex_lock(su_mutex);
>
> opts_item = item->ci_parent->ci_parent->ci_parent;
> opts = to_f_uvc_opts(opts_item);
>
> - ret = kstrtou8(page, 0, &num);
> - if (ret)
> - return ret;
>
> mutex_lock(&opts->lock);
>
> @@ -795,15 +796,15 @@ static ssize_t uvcg_extension_b_control_size_store(struct config_item *item,
> int ret;
> u8 num;
>
> + ret = kstrtou8(page, 0, &num);
> + if (ret)
> + return ret;
> +
> mutex_lock(su_mutex);
>
> opts_item = item->ci_parent->ci_parent->ci_parent;
> opts = to_f_uvc_opts(opts_item);
>
> - ret = kstrtou8(page, 0, &num);
> - if (ret)
> - return ret;
> -
> mutex_lock(&opts->lock);
>
> if (num == xu->desc.bControlSize) {
prev parent reply other threads:[~2023-02-16 14:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 12:16 [PATCH] usb: gadget: uvc: unlock on an error paths Dan Carpenter
2023-02-16 14:26 ` Dan Scally [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a3f5ec02-6e23-c3a6-3c5b-9413337615ec@ideasonboard.com \
--to=dan.scally@ideasonboard.com \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox