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

Commit e6087001 authored by John Ogness's avatar John Ogness Committed by Johan Hovold
Browse files

USB: serial: sierra: fix potential deadlock at close 



The portdata spinlock can be taken in interrupt context (via
sierra_outdat_callback()).
Disable interrupts when taking the portdata spinlock when discarding
deferred URBs during close to prevent a possible deadlock.

Fixes: 014333f7 ("USB: sierra: fix urb and memory leak on disconnect")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
[ johan: amend commit message and add fixes and stable tags ]
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 2ba02c8d

drivers/usb/serial/sierra.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -770,9 +770,9 @@ static void sierra_close(struct usb_serial_port *port) 
		kfree(urb->transfer_buffer);

		kfree(urb->transfer_buffer);

		usb_free_urb(urb);

		usb_free_urb(urb);

		usb_autopm_put_interface_async(serial->interface);

		usb_autopm_put_interface_async(serial->interface);

		spin_lock(&portdata->lock);

		spin_lock_irq(&portdata->lock);

		portdata->outstanding_urbs--;

		portdata->outstanding_urbs--;

		spin_unlock(&portdata->lock);

		spin_unlock_irq(&portdata->lock);

	}

	}





	sierra_stop_rx_urbs(port);

	sierra_stop_rx_urbs(port);