Skip to contentSkip to conversation

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

PATCH In review Alexey Khoroshilov 2 participants 3 messages May 26, 2011 – May 27, 2011 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb-gadget: unlock data->lock mutex on error path in ep_write()

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

It is similar to commit 00cc7a5faf25b3ba5cf30fcffc62249bdd152006 for ep_read(), it was not fixed at that time by accident.

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 +3 -1
index a01383f..a56876a 100644
@@ -431,8 +431,10 @@ ep_write (struct file *fd, const 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))
Signature · 1 line
1.7.4.1
#1 lore raw

Hello.

Quoted 5 lines · Alexey Khoroshilov

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

It is similar to commit 00cc7a5faf25b3ba5cf30fcffc62249bdd152006 for ep_read(),

Please specify that commit's summary in parens.

Quoted 5 lines

it was not fixed at that time by accident.

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

WBR, Sergei

#2 lore raw
Quoted 4 lines · Sergei Shtylyov
Quoted 2 lines

It is similar to commit 00cc7a5faf25b3ba5cf30fcffc62249bdd152006 for ep_read(),

Please specify that commit's summary in parens.

Done. Thank you.

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

It is similar to commit 00cc7a5 ("usb-gadget: unlock data->lock mutex on error path in ep_read()"), it was not fixed at that time by accident.

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 +3 -1
index a01383f..a56876a 100644
@@ -431,8 +431,10 @@ ep_write (struct file *fd, const 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.4.1