diff options
| author | Johan Hovold <jhovold@gmail.com> | 2010-03-17 23:00:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 13:21:33 -0700 |
| commit | 50dbb8528757b1977efd5d270ed9d262cbbef87d (patch) | |
| tree | d64c9e367ba2aef9cd2325aa2304edd47fc39eff /drivers/usb/serial/generic.c | |
| parent | 30af7fb5a40f8724c130428473edffa73170e04c (diff) | |
| download | blackbird-op-linux-50dbb8528757b1977efd5d270ed9d262cbbef87d.tar.gz blackbird-op-linux-50dbb8528757b1977efd5d270ed9d262cbbef87d.zip | |
USB: serial: fix missing locking on fifo in write callback
On errors the fifo was reset without any locking. This could race with
write which do kfifo_put and perhaps also chars_in_buffer and write_room.
Every other access to the fifo is protected using the port lock so
better add it to the error path as well.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 8f78d7b8e888..2a3196a2c66c 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -519,10 +519,13 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) port->write_urb_busy = 0; spin_unlock_irqrestore(&port->lock, flags); - if (status) + if (status) { + spin_lock_irqsave(&port->lock, flags); kfifo_reset_out(&port->write_fifo); - else + spin_unlock_irqrestore(&port->lock, flags); + } else { usb_serial_generic_write_start(port); + } } if (status) |
