diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2010-09-28 14:48:47 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-11 17:33:20 -0500 |
commit | 526f7c7950bbf1271e59177d70d74438c2ef96de (patch) | |
tree | 5e8550890534e73a307e53707d68ccbedaac62af /drivers/scsi/sd.h | |
parent | 3e51d3c924aea8a1f1372e6c615b0a37b528121d (diff) | |
download | op-kernel-dev-526f7c7950bbf1271e59177d70d74438c2ef96de.zip op-kernel-dev-526f7c7950bbf1271e59177d70d74438c2ef96de.tar.gz |
[SCSI] sd: Fix overflow with big physical blocks
The hw_sector_size variable could overflow if a device reported huge
physical blocks. Switch to the more accurate physical_block_size
terminology and make sure we use an unsigned int to match the range
permitted by READ CAPACITY(16).
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/sd.h')
-rw-r--r-- | drivers/scsi/sd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index a40730e..55488fa 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -51,7 +51,7 @@ struct scsi_disk { atomic_t openers; sector_t capacity; /* size in 512-byte sectors */ u32 index; - unsigned short hw_sector_size; + unsigned int physical_block_size; u8 media_present; u8 write_prot; u8 protection_type;/* Data Integrity Field */ |