lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: serial: fix race between unthrottle and completion handler in opticon

Browse Source 
usb:usbserial:opticon: fix race between unthrottle and completion handler

opticon_unthrottle() mustn't resubmit the URB unconditionally
as the URB may still be running.

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum
2009-10-07 09:25:10 +02:00
committed by Greg Kroah-Hartman
parent d55500941f
commit 88fa6590b3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/serial/opticon.c
View File

@@ -314,22 +314,25 @@ static void opticon_unthrottle(struct tty_struct *tty)
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct opticon_private *priv = usb_get_serial_data(port->serial); struct opticon_private *priv = usb_get_serial_data(port->serial);
unsigned long flags; unsigned long flags;
int result; int result, was_throttled;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
priv->throttled = false; priv->throttled = false;
was_throttled = priv->actually_throttled;
priv->actually_throttled = false; priv->actually_throttled = false;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
priv->bulk_read_urb->dev = port->serial->dev; priv->bulk_read_urb->dev = port->serial->dev;
if (was_throttled) {
result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC); result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
if (result) if (result)
dev_err(&port->dev, dev_err(&port->dev,
"%s - failed submitting read urb, error %d\n", "%s - failed submitting read urb, error %d\n",
__func__, result); __func__, result);
} }
}
static int opticon_tiocmget(struct tty_struct *tty, struct file *file) static int opticon_tiocmget(struct tty_struct *tty, struct file *file)
{ {