This is a note to let you know that I've just added the patch titled
USB: sierra: fix urb and memory leak on disconnect
to the 3.14-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-urb-and-memory-leak-on-disconnect.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 014333f77c0b71123d6ef7d31a9724e0699c9548 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@xxxxxxxxx>
Date: Mon, 26 May 2014 19:22:53 +0200
Subject: USB: sierra: fix urb and memory leak on disconnect
From: Johan Hovold <jhovold@xxxxxxxxx>
commit 014333f77c0b71123d6ef7d31a9724e0699c9548 upstream.
The delayed-write queue was never emptied on disconnect, something which
would lead to leaked urbs and transfer buffers if the device is
disconnected before being runtime resumed due to a write.
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 | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -759,6 +759,7 @@ static void sierra_close(struct usb_seri
struct usb_serial *serial = port->serial;
struct sierra_port_private *portdata;
struct sierra_intf_private *intfdata = port->serial->private;
+ struct urb *urb;
portdata = usb_get_serial_port_data(port);
@@ -780,6 +781,18 @@ static void sierra_close(struct usb_seri
portdata->opened = 0;
spin_unlock_irq(&intfdata->susp_lock);
+ for (;;) {
+ urb = usb_get_from_anchor(&portdata->delayed);
+ if (!urb)
+ break;
+ kfree(urb->transfer_buffer);
+ usb_free_urb(urb);
+ usb_autopm_put_interface_async(serial->interface);
+ spin_lock(&portdata->lock);
+ portdata->outstanding_urbs--;
+ spin_unlock(&portdata->lock);
+ }
+
sierra_stop_rx_urbs(port);
for (i = 0; i < portdata->num_in_urbs; i++) {
sierra_release_urb(portdata->in_urbs[i]);
Patches currently in stable-queue which might be from jhovold@xxxxxxxxx are
queue-3.14/usb-sierra-fix-urb-and-memory-leak-in-resume-error-path.patch
queue-3.14/usb-sierra-fix-aa-deadlock-in-open-error-path.patch
queue-3.14/usb-usb_wwan-fix-urb-leak-at-shutdown.patch
queue-3.14/usb-option-fix-runtime-pm-handling.patch
queue-3.14/usb-sierra-fix-remote-wakeup.patch
queue-3.14/usb-sierra-fix-urb-and-memory-leak-on-disconnect.patch
queue-3.14/net-cpsw-fix-null-dereference-at-probe.patch
queue-3.14/usb-sierra-fix-use-after-free-at-suspend-resume.patch
queue-3.14/usb-usb_wwan-fix-write-and-suspend-race.patch
queue-3.14/revert-net-eth-cpsw-correctly-attach-to-gpio-bitbang-mdio.patch
queue-3.14/usb-usb_wwan-fix-potential-null-deref-at-resume.patch
queue-3.14/usb-usb_wwan-fix-race-between-write-and-resume.patch
queue-3.14/usb-usb_wwan-fix-potential-blocked-i-o-after-resume.patch
queue-3.14/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