This is a note to let you know that I've just added the patch titled
USB: sierra: fix urb and memory leak in resume error path
to the 3.15-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-in-resume-error-path.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7fdd26a01eb7b6cb6855ff8f69ef4a720720dfcb Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@xxxxxxxxx>
Date: Mon, 26 May 2014 19:22:52 +0200
Subject: USB: sierra: fix urb and memory leak in resume error path
From: Johan Hovold <jhovold@xxxxxxxxx>
commit 7fdd26a01eb7b6cb6855ff8f69ef4a720720dfcb upstream.
Neither the transfer buffer or the urb itself were released in the
resume error path for delayed writes. Also on errors, the remainder of
the queue was not even processed, which leads to further urb and buffer
leaks.
The same error path also failed to balance the outstanding-urb counter,
something which results in degraded throughput or completely blocked
writes.
Fix this by releasing urb and buffer and balancing counters on errors,
and by always processing the whole queue even when submission of one urb
fails.
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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1004,8 +1004,12 @@ static int sierra_resume(struct usb_seri
if (err < 0) {
intfdata->in_flight--;
usb_unanchor_urb(urb);
- usb_scuttle_anchored_urbs(&portdata->delayed);
- break;
+ kfree(urb->transfer_buffer);
+ usb_free_urb(urb);
+ spin_lock(&portdata->lock);
+ portdata->outstanding_urbs--;
+ spin_unlock(&portdata->lock);
+ continue;
}
}
Patches currently in stable-queue which might be from jhovold@xxxxxxxxx are
queue-3.15/usb-sierra-fix-urb-and-memory-leak-in-resume-error-path.patch
queue-3.15/usb-sierra-fix-aa-deadlock-in-open-error-path.patch
queue-3.15/usb-usb_wwan-fix-urb-leak-at-shutdown.patch
queue-3.15/usb-option-fix-runtime-pm-handling.patch
queue-3.15/usb-sierra-fix-remote-wakeup.patch
queue-3.15/usb-sierra-fix-urb-and-memory-leak-on-disconnect.patch
queue-3.15/usb-sierra-fix-use-after-free-at-suspend-resume.patch
queue-3.15/usb-usb_wwan-fix-write-and-suspend-race.patch
queue-3.15/usb-usb_wwan-fix-potential-null-deref-at-resume.patch
queue-3.15/usb-usb_wwan-fix-race-between-write-and-resume.patch
queue-3.15/usb-usb_wwan-fix-potential-blocked-i-o-after-resume.patch
queue-3.15/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