Commit b2a5cf1b authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarOliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 88fa6590

drivers/usb/serial/symbolserial.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -179,21 +179,25 @@ 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;

	if (was_throttled) {

		result = usb_submit_urb(priv->int_urb, GFP_ATOMIC);

		result = usb_submit_urb(priv->int_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 symbol_startup(struct usb_serial *serial)

static int symbol_startup(struct usb_serial *serial)

{

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE