diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2018-10-08 14:28:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-01 09:16:29 +0100 |
| commit | 2f1e4e65ba415908212d93d665a8338dad1aac8a (patch) | |
| tree | 688ec16323018ef8dcc129c848669bb25628160a /drivers/nvme | |
| parent | 30ca1af4948123174d1b63bf6d6f967857a6a638 (diff) | |
| download | linux-stable-2f1e4e65ba415908212d93d665a8338dad1aac8a.tar.gz linux-stable-2f1e4e65ba415908212d93d665a8338dad1aac8a.tar.bz2 linux-stable-2f1e4e65ba415908212d93d665a8338dad1aac8a.zip | |
nvmet: avoid integer overflow in the discard code
[ Upstream commit 8eacd1bd21d6913ec27e6120e9a8733352e191d3 ]
Although I'm not sure whether it is a good idea to support large discard
commands, I think integer overflow for discard ranges larger than 4 GB
should be avoided. This patch avoids that smatch reports the following:
drivers/nvme/target/io-cmd-file.c:249:1 nvmet_file_execute_discard() warn: should '((range.nlb)) << req->ns->blksize_shift' be a 64 bit type?
Fixes: d5eff33ee6f8 ("nvmet: add simple file backed ns support")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/target/io-cmd-file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c index 81a9dc5290a8..39d972e2595f 100644 --- a/drivers/nvme/target/io-cmd-file.c +++ b/drivers/nvme/target/io-cmd-file.c @@ -246,7 +246,8 @@ static void nvmet_file_execute_discard(struct nvmet_req *req) break; offset = le64_to_cpu(range.slba) << req->ns->blksize_shift; - len = le32_to_cpu(range.nlb) << req->ns->blksize_shift; + len = le32_to_cpu(range.nlb); + len <<= req->ns->blksize_shift; if (offset + len > req->ns->size) { ret = NVME_SC_LBA_RANGE | NVME_SC_DNR; break; |