We have exactly one TMF. It must be locked against reuse. Signed-off-by: Oliver Neukum <oneukum@xxxxxxxx> --- drivers/usb/storage/uas.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 05b6f80..06211ee 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -54,6 +54,7 @@ struct uas_dev_info { struct scsi_cmnd *cmnd[MAX_CMNDS]; spinlock_t lock; struct work_struct work; + struct mutex management_mutex; }; enum { @@ -732,6 +733,7 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd) /* Ensure that try_complete does not call scsi_done */ cmdinfo->state |= COMMAND_ABORTED; + mutex_lock(&devinfo->management_mutex); usb_fill_bulk_urb(devinfo->management_urb, devinfo->udev, devinfo->cmd_pipe, /* shared */ @@ -749,6 +751,7 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd) goto give_up; give_up: + mutex_unlock(&devinfo->management_mutex); /* Drop all refs to this cmnd, kill data urbs to break their ref */ devinfo->cmnd[cmdinfo->uas_tag - TAG_OFFSET] = NULL; @@ -996,6 +999,7 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id) init_usb_anchor(&devinfo->data_urbs); spin_lock_init(&devinfo->lock); INIT_WORK(&devinfo->work, uas_do_work); + mutex_init(&devinfo->management_mutex); result = uas_configure_endpoints(devinfo); if (result) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html