From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B54A1C432C0 for ; Wed, 27 Nov 2019 21:28:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FE582080F for ; Wed, 27 Nov 2019 21:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890121; bh=bPTlPH2rYRCi56/K0e6IaVB93IuksRjPjxYZGiewy/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pfaCBniaanbsQLNcPV3HQv9NTGd9iVanH2G1X/k1YzL0EQ78nIqVhOuO6GaCQ8/N4 du62pWDX5tKIz6QdEp45I+2WNJ5fRPuADmEbtHLwMVEGL2etJv98ubTCJzcE7pi71F LfCvCzSuk2NnKOvA70Yo+u6ERuFCD5SjHie7i/xU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731274AbfK0U6G (ORCPT ); Wed, 27 Nov 2019 15:58:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:49294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729462AbfK0U6G (ORCPT ); Wed, 27 Nov 2019 15:58:06 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C057321582; Wed, 27 Nov 2019 20:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888285; bh=bPTlPH2rYRCi56/K0e6IaVB93IuksRjPjxYZGiewy/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbkcJD2KsGoeelT3yxgIx+zsMNgC3N8L9CS2T1wr51PmHlmXU4uHaTWBPGVmax9Br SFLWzV7GstUG/tgbMVnLGS4ieP1wqwL/pTSY2pdS/a5O5yuJNlupGzUv8Q8RqwBEG8 Vqy6INHOY/B2ygRYuF0/lXyOAKiqB9vHvTA6n4a4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bart Van Assche , Chaitanya Kulkarni , Christoph Hellwig , Sasha Levin Subject: [PATCH 4.19 075/306] nvmet: avoid integer overflow in the discard code Date: Wed, 27 Nov 2019 21:28:45 +0100 Message-Id: <20191127203120.350833425@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bart Van Assche [ 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 Reviewed-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/target/io-cmd-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c index 81a9dc5290a87..39d972e2595f0 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; -- 2.20.1