Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88fa6590 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 opticon 



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

drivers/usb/serial/opticon.c

+8 −5
Original line number Diff line number Diff line
@@ -314,22 +314,25 @@ static void opticon_unthrottle(struct tty_struct *tty) 
	struct usb_serial_port *port = tty->driver_data;

	struct opticon_private *priv = usb_get_serial_data(port->serial);

	unsigned long flags;

	int result;

	int result, was_throttled;



	dbg("%s - port %d", __func__, port->number);



	spin_lock_irqsave(&priv->lock, flags);

	priv->throttled = false;

	was_throttled = priv->actually_throttled;

	priv->actually_throttled = false;

	spin_unlock_irqrestore(&priv->lock, flags);



	priv->bulk_read_urb->dev = port->serial->dev;

	if (was_throttled) {

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

		if (result)

			dev_err(&port->dev,

				"%s - failed submitting read urb, error %d\n",

							__func__, result);

	}

}



static int opticon_tiocmget(struct tty_struct *tty, struct file *file)

{