diff options
| author | brking@us.ibm.com <brking@us.ibm.com> | 2006-01-23 22:03:22 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2006-01-26 21:13:50 +0100 |
| commit | bb1d1073a10fdc8547e3eb821ee2488260094b39 (patch) | |
| tree | 139a30834cea40e0d967506cfdaea603cf56a192 /drivers/scsi/scsi_error.c | |
| parent | [SCSI] ips soft lockup during reset/initialization (diff) | |
| download | linux-bb1d1073a10fdc8547e3eb821ee2488260094b39.tar.xz linux-bb1d1073a10fdc8547e3eb821ee2488260094b39.zip | |
[SCSI] Prevent scsi_execute_async from guessing cdb length
When the scsi_execute_async interface was added it ended up reducing
the flexibility of userspace to send arbitrary scsi commands through
sg using SG_IO. The SG_IO interface allows userspace to specify the
CDB length. This is now ignored in scsi_execute_async and it is
guessed using the COMMAND_SIZE macro, which is not always correct,
particularly for vendor specific commands. This patch adds a cmd_len
parameter to the scsi_execute_async interface to allow the caller
to specify the length of the CDB.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index a2333d2c7af0..5cc97b721661 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1350,7 +1350,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) cmnd[4] = SCSI_REMOVAL_PREVENT; cmnd[5] = 0; - scsi_execute_async(sdev, cmnd, DMA_NONE, NULL, 0, 0, 10 * HZ, + scsi_execute_async(sdev, cmnd, 6, DMA_NONE, NULL, 0, 0, 10 * HZ, 5, NULL, NULL, GFP_KERNEL); } |