diff options
| author | Hans de Goede | 2013-11-14 11:06:13 +0100 |
|---|---|---|
| committer | Sarah Sharp | 2014-03-05 00:38:24 +0100 |
| commit | 3a4462e0e2fe8f715f54147d36b5433a7ff5a85a (patch) | |
| tree | 13643efc4a15e11299dd0e83eca09511d85aced6 /drivers/usb/storage | |
| parent | uas: Fix memory management (diff) | |
| download | kernel-qcow2-linux-3a4462e0e2fe8f715f54147d36b5433a7ff5a85a.tar.gz kernel-qcow2-linux-3a4462e0e2fe8f715f54147d36b5433a7ff5a85a.tar.xz kernel-qcow2-linux-3a4462e0e2fe8f715f54147d36b5433a7ff5a85a.zip | |
uas: Clear cmdinfo on command queue-ing
The scsi error handling path re-uses previously queued up (and errored-out)
cmds. If such a re-used cmd had a data-phase then cmdinfo will have
data_in_urb / data_out_urb still set to the free-ed urbs from the errored-out
cmd, and they will get free-ed a second time when the error handling cmd
completes, corrupting the kernel heap.
Clearing cmdinfo on command queue-ing fixes this, and seems like a good idea
in general.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/uas.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index d81d041842f4..fceffccc1be1 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -684,6 +684,8 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd, return SCSI_MLQUEUE_DEVICE_BUSY; } + memset(cmdinfo, 0, sizeof(*cmdinfo)); + if (blk_rq_tagged(cmnd->request)) { cmdinfo->stream = cmnd->request->tag + 2; } else { |