lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] aacraid: READ_CAPACITY_16 shouldn't trust allocation length in cdb

Browse Source 
When aacraid spoofs READ_CAPACITY_16, it assumes that the data length
in the sg list is equal to allocation length in cdb. But sg can put
any value in scb so the driver needs to check both the data length in
the sg list and allocation length in cdb.

If allocation length is larger than the response length that the
driver expects, it clears the data buffer in the sg list to zero but
it doesn't need to do. Just setting resid is fine.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Mark Salyzyn <Mark_Salyzyn@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori 2008-02-24 15:25:23 -08:00 committed by James Bottomley
parent b174be02f3
commit b271f1c881
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/scsi/aacraid/aachba.c
View File

@ -2047,6 +2047,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
{ {
u64 capacity; u64 capacity;
char cp[13]; char cp[13];
unsigned int alloc_len;
dprintk((KERN_DEBUG "READ CAPACITY_16 command.\n")); dprintk((KERN_DEBUG "READ CAPACITY_16 command.\n"));
capacity = fsa_dev_ptr[cid].size - 1; capacity = fsa_dev_ptr[cid].size - 1;
@ -2063,18 +2064,17 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
cp[10] = 2; cp[10] = 2;
cp[11] = 0; cp[11] = 0;
cp[12] = 0; cp[12] = 0;
aac_internal_transfer(scsicmd, cp, 0,
min_t(size_t, scsicmd->cmnd[13], sizeof(cp)));
if (sizeof(cp) < scsicmd->cmnd[13]) {
unsigned int len, offset = sizeof(cp);
memset(cp, 0, offset); alloc_len = ((scsicmd->cmnd[10] << 24)
do { + (scsicmd->cmnd[11] << 16)
len = min_t(size_t, scsicmd->cmnd[13] - offset, + (scsicmd->cmnd[12] << 8) + scsicmd->cmnd[13]);
sizeof(cp));
aac_internal_transfer(scsicmd, cp, offset, len); alloc_len = min_t(size_t, alloc_len, sizeof(cp));
} while ((offset += len) < scsicmd->cmnd[13]); aac_internal_transfer(scsicmd, cp, 0, alloc_len);
}
if (alloc_len < scsi_bufflen(scsicmd))
scsi_set_resid(scsicmd,
scsi_bufflen(scsicmd) - alloc_len);
/* Do not cache partition table for arrays */ /* Do not cache partition table for arrays */
scsicmd->device->removable = 1; scsicmd->device->removable = 1;