UAS: Free status URB when we can't find the SCSI tag.
authorSarah Sharp <sarah.a.sharp@linux.intel.com>
Fri, 2 Dec 2011 19:55:48 +0000 (11:55 -0800)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 30 Apr 2012 18:15:14 +0000 (19:15 +0100)
BugLink: http://bugs.launchpad.net/bugs/901215

In the UAS status URB completion handler, we need to free the URB, no
matter what happens.  Fix a bug where we would leak the URB (and its
buffer) if we couldn't find a SCSI command that is associated with this
status phase.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
(cherry picked from commit 96c1eb9873caffc507a1951c36b43fdcf3ddeff3)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com>

drivers/usb/storage/uas.c

index 28d9b19..9dd4aae 100644 (file)
@@ -246,8 +246,10 @@ static void uas_stat_cmplt(struct urb *urb)
                cmnd = sdev->current_cmnd;
        else
                cmnd = scsi_find_tag(sdev, tag);
-       if (!cmnd)
+       if (!cmnd) {
+               usb_free_urb(urb);
                return;
+       }
 
        switch (iu->iu_id) {
        case IU_ID_STATUS: