Commit d89da03a authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman

uas: Check against unexpected completions

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e61aede
...@@ -371,6 +371,12 @@ static void uas_stat_cmplt(struct urb *urb) ...@@ -371,6 +371,12 @@ static void uas_stat_cmplt(struct urb *urb)
cmnd = devinfo->cmnd[idx]; cmnd = devinfo->cmnd[idx];
cmdinfo = (void *)&cmnd->SCp; cmdinfo = (void *)&cmnd->SCp;
if (!(cmdinfo->state & COMMAND_INFLIGHT)) {
scmd_printk(KERN_ERR, cmnd, "unexpected status cmplt\n");
goto out;
}
switch (iu->iu_id) { switch (iu->iu_id) {
case IU_ID_STATUS: case IU_ID_STATUS:
if (urb->actual_length < 16) if (urb->actual_length < 16)
...@@ -436,6 +442,12 @@ static void uas_data_cmplt(struct urb *urb) ...@@ -436,6 +442,12 @@ static void uas_data_cmplt(struct urb *urb)
if (devinfo->resetting) if (devinfo->resetting)
goto out; 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) {
if (urb->status != -ECONNRESET) { if (urb->status != -ECONNRESET) {
uas_log_cmd_state(cmnd, __func__); uas_log_cmd_state(cmnd, __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment