This is a note to let you know that I've just added the patch titled
USB: sierra: fix use after free at suspend/resume
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-sierra-fix-use-after-free-at-suspend-resume.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8452727de70f6ad850cd6d0aaa18b5d9050aa63b Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@xxxxxxxxx>
Date: Mon, 26 May 2014 19:22:51 +0200
Subject: USB: sierra: fix use after free at suspend/resume
From: Johan Hovold <jhovold@xxxxxxxxx>
commit 8452727de70f6ad850cd6d0aaa18b5d9050aa63b upstream.
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: e6929a9020ac ("USB: support for autosuspend in sierra while
online")
Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/serial/sierra.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -999,6 +999,7 @@ static void sierra_release(struct usb_se
portdata = usb_get_serial_port_data(port);
if (!portdata)
continue;
+ usb_set_serial_port_data(port, NULL);
kfree(portdata);
}
kfree(serial->private);
@@ -1015,6 +1016,8 @@ static void stop_read_write_urbs(struct
for (i = 0; i < serial->num_ports; ++i) {
port = serial->port[i];
portdata = usb_get_serial_port_data(port);
+ if (!portdata)
+ continue;
sierra_stop_rx_urbs(port);
usb_kill_anchored_urbs(&portdata->active);
}
@@ -1057,6 +1060,9 @@ static int sierra_resume(struct usb_seri
port = serial->port[i];
portdata = usb_get_serial_port_data(port);
+ if (!portdata)
+ continue;
+
while ((urb = usb_get_from_anchor(&portdata->delayed))) {
usb_anchor_urb(urb, &portdata->active);
intfdata->in_flight++;
Patches currently in stable-queue which might be from jhovold@xxxxxxxxx are
queue-3.4/usb-sierra-fix-urb-and-memory-leak-in-resume-error-path.patch
queue-3.4/usb-sierra-fix-aa-deadlock-in-open-error-path.patch
queue-3.4/usb-usb_wwan-fix-urb-leak-at-shutdown.patch
queue-3.4/usb-option-fix-runtime-pm-handling.patch
queue-3.4/usb-sierra-fix-remote-wakeup.patch
queue-3.4/usb-sierra-fix-urb-and-memory-leak-on-disconnect.patch
queue-3.4/usb-sierra-fix-use-after-free-at-suspend-resume.patch
queue-3.4/usb-usb_wwan-fix-write-and-suspend-race.patch
queue-3.4/usb-usb_wwan-fix-potential-null-deref-at-resume.patch
queue-3.4/usb-usb_wwan-fix-race-between-write-and-resume.patch
queue-3.4/usb-usb_wwan-fix-potential-blocked-i-o-after-resume.patch
queue-3.4/usb-usb_wwan-fix-urb-leak-in-write-error-path.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html