Commit d9e93c08 authored by xiao jin's avatar xiao jin Committed by Greg Kroah-Hartman

USB: usb_wwan: fix race between write and resume

We find a race between write and resume. usb_wwan_resume run play_delayed()
and spin_unlock, but intfdata->suspended still is not set to zero.
At this time usb_wwan_write is called and anchor the urb to delay
list. Then resume keep running but the delayed urb have no chance
to be commit until next resume. If the time of next resume is far
away, tty will be blocked in tty_wait_until_sent during time. The
race also can lead to writes being reordered.

This patch put play_Delayed and intfdata->suspended together in the
spinlock, it's to avoid the write race during resume.

Fixes: 383cedc3 ("USB: serial: full autosuspend support for the
option driver")
Signed-off-by: default avatarxiao jin <jin.xiao@intel.com>
Signed-off-by: default avatarZhang, Qi1 <qi1.zhang@intel.com>
Reviewed-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
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 db090473
...@@ -660,17 +660,15 @@ int usb_wwan_resume(struct usb_serial *serial) ...@@ -660,17 +660,15 @@ int usb_wwan_resume(struct usb_serial *serial)
} }
} }
spin_lock_irq(&intfdata->susp_lock);
for (i = 0; i < serial->num_ports; i++) { for (i = 0; i < serial->num_ports; i++) {
/* walk all ports */ /* walk all ports */
port = serial->port[i]; port = serial->port[i];
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
/* skip closed ports */ /* skip closed ports */
spin_lock_irq(&intfdata->susp_lock); if (!portdata || !portdata->opened)
if (!portdata || !portdata->opened) {
spin_unlock_irq(&intfdata->susp_lock);
continue; continue;
}
for (j = 0; j < N_IN_URB; j++) { for (j = 0; j < N_IN_URB; j++) {
urb = portdata->in_urbs[j]; urb = portdata->in_urbs[j];
...@@ -683,9 +681,7 @@ int usb_wwan_resume(struct usb_serial *serial) ...@@ -683,9 +681,7 @@ int usb_wwan_resume(struct usb_serial *serial)
} }
} }
play_delayed(port); play_delayed(port);
spin_unlock_irq(&intfdata->susp_lock);
} }
spin_lock_irq(&intfdata->susp_lock);
intfdata->suspended = 0; intfdata->suspended = 0;
spin_unlock_irq(&intfdata->susp_lock); spin_unlock_irq(&intfdata->susp_lock);
err_out: err_out:
......
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