From: Mike Christie <mchristi@xxxxxxxxxx> logical_block_size and max_blocks are 32 bits, so we can overflow when trying to convert SCSI device blocks to linux block layer sectors. Signed-off-by: Mike Christie <mchristi@xxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx --- drivers/scsi/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index f52b74c..1668e1d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -690,7 +690,8 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) break; } - blk_queue_max_discard_sectors(q, max_blocks * (logical_block_size >> 9)); + blk_queue_max_discard_sectors(q, (u64)max_blocks * + (logical_block_size >> 9)); queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); } -- 2.7.2 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
