diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-12-17 21:32:00 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-12-17 21:32:00 +0100 |
| commit | 961428b9aed2ee9cf631d16f1620640cd54a4557 (patch) | |
| tree | c0e072a268b68e7fad28a2a561e8f915fd15c9ff /block | |
| parent | dcc6e343ff0463b005ca0488be90b8d0025de3e4 (diff) | |
| download | linux-stable-961428b9aed2ee9cf631d16f1620640cd54a4557.tar.gz linux-stable-961428b9aed2ee9cf631d16f1620640cd54a4557.tar.bz2 linux-stable-961428b9aed2ee9cf631d16f1620640cd54a4557.zip | |
scsi: clear garbage after CDBs on SG_IO
ATAPI devices transfer fixed number of bytes for CDBs (12 or 16). Some
ATAPI devices choke when shorter CDB is used and the left bytes contain
garbage. Block SG_IO cleared left bytes but SCSI SG_IO didn't. This patch
makes SCSI SG_IO clear it and simplify CDB clearing in block SG_IO.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index f84f269b005c..e94da0604408 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -286,9 +286,8 @@ static int sg_io(struct file *file, request_queue_t *q, * fill in request structure */ rq->cmd_len = hdr->cmd_len; + memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ memcpy(rq->cmd, cmd, hdr->cmd_len); - if (sizeof(rq->cmd) != hdr->cmd_len) - memset(rq->cmd + hdr->cmd_len, 0, sizeof(rq->cmd) - hdr->cmd_len); memset(sense, 0, sizeof(sense)); rq->sense = sense; |