The status urb should not complete before the command has been submitted, nor
should we get a second status urb for the same tag after a IU_ID_STATUS.

Data urbs should not complete before the command has been submitted, but may
complete after the IU_ID_STATUS.

Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
 drivers/usb/storage/uas.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index b2423d3..1ef59b0 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -369,6 +369,12 @@ static void uas_stat_cmplt(struct urb *urb)
 
        cmnd = devinfo->cmnd[idx];
        cmdinfo = (void *)&cmnd->SCp;
+
+       if (!(cmdinfo->state & COMMAND_INFLIGHT)) {
+               scmd_printk(KERN_ERR, cmnd, "unexpected status cmplt\n");
+               goto out;
+       }
+
        switch (iu->iu_id) {
        case IU_ID_STATUS:
                if (urb->actual_length < 16)
@@ -434,6 +440,12 @@ static void uas_data_cmplt(struct urb *urb)
        if (devinfo->resetting)
                goto out;
 
+       /* Data urbs should not complete before the cmd urb is submitted */
+       if (cmdinfo->state & SUBMIT_CMD_URB) {
+               scmd_printk(KERN_ERR, cmnd, "unexpected data cmplt\n");
+               goto out;
+       }
+
        if (urb->status) {
                if (urb->status != -ECONNRESET) {
                        uas_log_cmd_state(cmnd, __func__);
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to