Commit 12a24531 authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman

USB: usbserial - fix potential deadlock between write() and IRQ

patch acd2a847 in mainline.

USB: usbserial - fix potential deadlock between write() and IRQ

usb_serial_generic_write() doesn't disable interrupts when taking port->lock,
and could therefore deadlock with usb_serial_generic_read_bulk_callback()
being called from interrupt, taking the same lock. Fix it.
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Acked-by: default avatarLarry Finger <larry.finger@lwfinger.net>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9c560a68
...@@ -190,14 +190,15 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char * ...@@ -190,14 +190,15 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *
/* only do something if we have a bulk out endpoint */ /* only do something if we have a bulk out endpoint */
if (serial->num_bulk_out) { if (serial->num_bulk_out) {
spin_lock_bh(&port->lock); unsigned long flags;
spin_lock_irqsave(&port->lock, flags);
if (port->write_urb_busy) { if (port->write_urb_busy) {
spin_unlock_bh(&port->lock); spin_unlock_irqrestore(&port->lock, flags);
dbg("%s - already writing", __FUNCTION__); dbg("%s - already writing", __FUNCTION__);
return 0; return 0;
} }
port->write_urb_busy = 1; port->write_urb_busy = 1;
spin_unlock_bh(&port->lock); spin_unlock_irqrestore(&port->lock, flags);
count = (count > port->bulk_out_size) ? port->bulk_out_size : count; count = (count > port->bulk_out_size) ? port->bulk_out_size : count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment