From: mchristi@redhat.com
To: linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
socketpair@gmail.com
Cc: Mike Christie <mchristi@redhat.com>, stable@vger.kernel.org
Subject: [PATCH 1/2] scsi: fix max discard sectors calculation
Date: Mon, 16 May 2016 13:46:49 -0500 [thread overview]
Message-ID: <1463424410-17196-2-git-send-email-mchristi@redhat.com> (raw)
In-Reply-To: <1463424410-17196-1-git-send-email-mchristi@redhat.com>
From: Mike Christie <mchristi@redhat.com>
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@redhat.com>
Cc: stable@vger.kernel.org
---
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
next prev parent reply other threads:[~2016-05-16 18:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-16 18:46 [PATCH 0/2] fix max discard sectors calculation mchristi
2016-05-16 18:46 ` mchristi [this message]
2016-05-16 22:44 ` [PATCH 1/2] scsi: " Bart Van Assche
2016-05-17 3:46 ` Mike Christie
2016-05-16 18:46 ` [PATCH 2/2] target: " mchristi
2016-05-16 18:57 ` Bart Van Assche
2016-05-16 19:00 ` Mike Christie
2016-05-16 19:02 ` Martin K. Petersen
2016-05-17 18:16 ` Bart Van Assche
2016-05-17 21:49 ` Mike Christie
2016-05-18 16:56 ` Bart Van Assche
2016-05-18 17:17 ` Mike Christie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463424410-17196-2-git-send-email-mchristi@redhat.com \
--to=mchristi@redhat.com \
--cc=linux-scsi@vger.kernel.org \
--cc=socketpair@gmail.com \
--cc=stable@vger.kernel.org \
--cc=target-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).