From: Geert Uytterhoeven Date: Mon, 4 Nov 2013 09:21:05 +0000 (+0100) Subject: [SCSI] sd: Do not call do_div() with a 64-bit divisor X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef80d1e18b014af08741cf688e3fdda1fb71363f;p=linux-beck.git [SCSI] sd: Do not call do_div() with a 64-bit divisor do_div() is meant for divisions of 64-bit number by 32-bit numbers. Passing 64-bit divisor types caused issues in the past on 32-bit platforms, cfr. commit ea077b1b96e073eac5c3c5590529e964767fc5f7 ("m68k: Truncate base in do_div()"). As scsi_device.sector_size is unsigned (int), factor should be unsigned int, too. Signed-off-by: Geert Uytterhoeven Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 35a785609364..9846c6ab2aaa 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1626,7 +1626,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd) end_lba <<= 1; } else { /* be careful ... don't want any overflows */ - u64 factor = scmd->device->sector_size / 512; + unsigned int factor = scmd->device->sector_size / 512; do_div(start_lba, factor); do_div(end_lba, factor); }