1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index b1a1acb43461..10a3dea041ed 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -249,6 +249,25 @@ static void uas_log_cmd_state(struct scsi_cmnd *cmnd, const char *caller)
                     (ci->state & IS_IN_WORK_LIST)       ? " work"  : "");
 }
 
+static void uas_free_unsubmitted_urbs(struct scsi_cmnd *cmnd)
+{
+        struct uas_cmd_info *cmdinfo;
+
+        if (!cmnd)
+                return;
+
+        cmdinfo = (void *)&cmnd->SCp;
+
+        if (cmdinfo->state & SUBMIT_CMD_URB)
+                usb_free_urb(cmdinfo->cmd_urb);
+
+        /* data urbs may have never gotten their submit flag set */
+        if (!(cmdinfo->state & DATA_IN_URB_INFLIGHT))
+                usb_free_urb(cmdinfo->data_in_urb);
+        if (!(cmdinfo->state & DATA_OUT_URB_INFLIGHT))
+                usb_free_urb(cmdinfo->data_out_urb);
+}
+
 static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
 {
         struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp;
@@ -263,6 +282,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
         WARN_ON_ONCE(cmdinfo->state & COMMAND_COMPLETED);
         cmdinfo->state |= COMMAND_COMPLETED;
         devinfo->cmnd[uas_get_tag(cmnd) - 1] = NULL;
+        uas_free_unsubmitted_urbs(cmnd);
         cmnd->scsi_done(cmnd);
         return 0;
 }
@@ -738,6 +758,8 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd)
         if (cmdinfo->state & DATA_OUT_URB_INFLIGHT)
                 data_out_urb = usb_get_urb(cmdinfo->data_out_urb);
 
+        uas_free_unsubmitted_urbs(cmnd);
+
         spin_unlock_irqrestore(&devinfo->lock, flags);
 
         if (data_in_urb) {