2011-03-04 23:20:08

by Alexey Khoroshilov

Subject: [PATCH] usb-gadget: unlock data->lock mutex on error path in ep_read()

ep_read() acquires data->lock mutex in get_ready_ep() and releases it on
all paths except for one: when usb_endpoint_xfer_isoc() failed. The patch
adds mutex_unlock(&data->lock) at that path.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
drivers/usb/gadget/inode.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 3ed73f4..a01383f 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -386,8 +386,10 @@ ep_read (struct file *fd, char __user *buf, size_t
len, loff_t *ptr)

/* halt any endpoint by doing a "wrong direction" i/o call */
if (usb_endpoint_dir_in(&data->desc)) {
- if (usb_endpoint_xfer_isoc(&data->desc))
+ if (usb_endpoint_xfer_isoc(&data->desc)) {
+ mutex_unlock(&data->lock);
return -EINVAL;
+ }
DBG (data->dev, "%s halt\n", data->name);
spin_lock_irq (&data->dev->lock);
if (likely (data->ep != NULL))
--
1.7.0.4

2011-03-07 20:24:17

by Greg KH

Subject: Re: [PATCH] usb-gadget: unlock data->lock mutex on error path in ep_read()

On Sat, Mar 05, 2011 at 01:54:50AM +0300, Alexey Khoroshilov wrote:
> ep_read() acquires data->lock mutex in get_ready_ep() and releases it on
> all paths except for one: when usb_endpoint_xfer_isoc() failed. The patch
> adds mutex_unlock(&data->lock) at that path.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>
> ---
> drivers/usb/gadget/inode.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
> index 3ed73f4..a01383f 100644
> --- a/drivers/usb/gadget/inode.c
> +++ b/drivers/usb/gadget/inode.c
> @@ -386,8 +386,10 @@ ep_read (struct file *fd, char __user *buf, size_t
> len, loff_t *ptr)
>
> /* halt any endpoint by doing a "wrong direction" i/o call */
> if (usb_endpoint_dir_in(&data->desc)) {
> - if (usb_endpoint_xfer_isoc(&data->desc))

Your patch is line-wrapped and all of the tabs are converted to spaces,
making it impossible to apply :(

Care to fix your email client and try again?

thanks,

greg k-h

2011-03-09 08:10:22

by Alexey Khoroshilov

Subject: Re: [PATCH] usb-gadget: unlock data->lock mutex on error path in ep_read()

On 03/07/2011 11:13 PM, Greg KH wrote:
>
> Your patch is line-wrapped and all of the tabs are converted to spaces,
> making it impossible to apply :(
>
> Care to fix your email client and try again?
>
> thanks,
>
> greg k-h
>

Greg,

Thank you very much for your reply!
Done.

Alexey