[PATCH 3.2 025/125] USB: sierra: fix urb and memory leak in resume error path

From: Ben Hutchings
Date: Tue Jul 08 2014 - 15:14:59 EST

3.2.61-rc1 review patch. If anyone has any objections, please let me know.


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

The same error path also failed to balance the outstanding-urb counter,
something which results in degraded throughput or completely blocked

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

Fixes: e6929a9020ac ("USB: support for autosuspend in sierra while

Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
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
@@ -1065,8 +1065,12 @@ static int sierra_resume(struct usb_seri
if (err < 0) {
- 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;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/