openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: sierra: fix use after free at suspend/resume 

Fix use after free or NULL-pointer dereference during suspend and
resume.

The port data may never have been allocated (port probe failed)
or may already have been released by port_remove (e.g. driver is
unloaded) when suspend and resume are called.

Fixes: e6929a9020 ("USB: support for autosuspend in sierra while
online")

Cc: <stable@vger.kernel.org>	# v2.6.32
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2014-05-26 19:22:51 +02:00 committed by Greg Kroah-Hartman
parent 353fe19860
commit 8452727de7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/serial/sierra.c
View File

@ -933,6 +933,7 @@ static int sierra_port_remove(struct usb_serial_port *port)
struct sierra_port_private *portdata; struct sierra_port_private *portdata;
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
usb_set_serial_port_data(port, NULL);
kfree(portdata); kfree(portdata);
return 0; return 0;
@ -949,6 +950,8 @@ static void stop_read_write_urbs(struct usb_serial *serial)
for (i = 0; i < serial->num_ports; ++i) { for (i = 0; i < serial->num_ports; ++i) {
port = serial->port[i]; port = serial->port[i];
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
if (!portdata)
continue;
sierra_stop_rx_urbs(port); sierra_stop_rx_urbs(port);
usb_kill_anchored_urbs(&portdata->active); usb_kill_anchored_urbs(&portdata->active);
} }
@ -991,6 +994,9 @@ static int sierra_resume(struct usb_serial *serial)
port = serial->port[i]; port = serial->port[i];
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
if (!portdata)
continue;
while ((urb = usb_get_from_anchor(&portdata->delayed))) { while ((urb = usb_get_from_anchor(&portdata->delayed))) {
usb_anchor_urb(urb, &portdata->active); usb_anchor_urb(urb, &portdata->active);
intfdata->in_flight++; intfdata->in_flight++;