Commit 00cc7a5f authored Mar 16, 2011 by Alexey Khoroshilov Committed by Greg Kroah-Hartman Apr 13, 2011

USB: 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 <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent d06847fe

drivers/usb/gadget/inode.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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))