leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uas: Check against unexpected completions

Browse Source 
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 <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans de Goede 2014-09-13 12:26:33 +02:00 committed by Greg Kroah-Hartman
parent 5e61aede47
commit d89da03ace
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/storage/uas.c
View File

@ -371,6 +371,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)
@ -436,6 +442,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__);