Commit 170fad9e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: usb_wwan: fix write and suspend race

Fix race between write() and suspend() which could lead to writes being
dropped (or I/O while suspended) if the device is runtime suspended
while a write request is being processed.

Specifically, suspend() releases the susp_lock after determining the
device is idle but before setting the suspended flag, thus leaving a
window where a concurrent write() can submit an urb.

Fixes: 383cedc3 ("USB: serial: full autosuspend support for the
option driver")

Cc: <stable@vger.kernel.org>	# v2.6.32
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9e93c08
...@@ -579,20 +579,17 @@ static void stop_read_write_urbs(struct usb_serial *serial) ...@@ -579,20 +579,17 @@ static void stop_read_write_urbs(struct usb_serial *serial)
int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message) int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message)
{ {
struct usb_wwan_intf_private *intfdata = serial->private; struct usb_wwan_intf_private *intfdata = serial->private;
int b;
spin_lock_irq(&intfdata->susp_lock);
if (PMSG_IS_AUTO(message)) { if (PMSG_IS_AUTO(message)) {
spin_lock_irq(&intfdata->susp_lock); if (intfdata->in_flight) {
b = intfdata->in_flight; spin_unlock_irq(&intfdata->susp_lock);
spin_unlock_irq(&intfdata->susp_lock);
if (b)
return -EBUSY; return -EBUSY;
}
} }
spin_lock_irq(&intfdata->susp_lock);
intfdata->suspended = 1; intfdata->suspended = 1;
spin_unlock_irq(&intfdata->susp_lock); spin_unlock_irq(&intfdata->susp_lock);
stop_read_write_urbs(serial); stop_read_write_urbs(serial);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment