Skip to contentSkip to conversation

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

PATCH In review Alexey Khoroshilov 2 participants 2 messages Mar 9, 2011 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

---
 drivers/usb/gadget/inode.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/gadget/inode.c +0 -0
index 3ed73f4..a01383f 100644
@@ -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

#1 lore raw
Quoted 7 lines · Alexey Khoroshilov

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).

Need a space after your name and before the email address.

Anyway, your patch is still line-wrapped and the leading spaces stripped off, making it impossible to apply. After hand-editing it, it still fails, are you sure you made this against the linux-next tree?

Care to try again?

thanks,

greg k-h