evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
usb:usbserial:symbolserial: fix race between unthrottle and completion handler

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

the same bug as opticon.

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:30:49 +02:00 • committed by Greg Kroah-Hartman
parent 88fa6590b3
commit b2a5cf1bdc
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/usb/serial/symbolserial.c
View file

@ -179,20 +179,24 @@ static void symbol_unthrottle(struct tty_struct *tty)
struct symbol_private *priv = usb_get_serial_data(port->serial); struct symbol_private *priv = usb_get_serial_data(port->serial);
unsigned long flags; unsigned long flags;
int result; int result;
bool 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->int_urb->dev = port->serial->dev; priv->int_urb->dev = port->serial->dev;
result = usb_submit_urb(priv->int_urb, GFP_ATOMIC); if (was_throttled) {
if (result) result = usb_submit_urb(priv->int_urb, GFP_ATOMIC);
dev_err(&port->dev, if (result)
"%s - failed submitting read urb, error %d\n", dev_err(&port->dev,
"%s - failed submitting read urb, error %d\n",
__func__, result); __func__, result);
}
} }
static int symbol_startup(struct usb_serial *serial) static int symbol_startup(struct usb_serial *serial)