Skip to content

Commit

Permalink
USB: usbserial - fix potential deadlock between write() and IRQ
Browse files Browse the repository at this point in the history
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: Jiri Kosina <jkosina@suse.cz>
Acked-by: Larry Finger <larry.finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jiri Kosina authored and Greg Kroah-Hartman committed Oct 25, 2007
1 parent 8a28dea commit acd2a84
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/usb/serial/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,15 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *

/* only do something if we have a bulk out endpoint */
if (serial->num_bulk_out) {
spin_lock_bh(&port->lock);
unsigned long flags;
spin_lock_irqsave(&port->lock, flags);
if (port->write_urb_busy) {
spin_unlock_bh(&port->lock);
spin_unlock_irqrestore(&port->lock, flags);
dbg("%s - already writing", __FUNCTION__);
return 0;
}
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;

Expand Down

0 comments on commit acd2a84

Please sign in to comment.