From nobody Sat Nov 15 15:30:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=irrelevant.dk ARC-Seal: i=1; a=rsa-sha256; t=1596060659; cv=none; d=zohomail.com; s=zohoarc; b=JhCx0NRvbuEVfGjO3ij5C9RLJsnkJcWpB3oIfEGDOgw7tb55B8pbOve3VS38dlHA2zdP7WZDLdQ4EE4t7auRnhwAZwGKGS+xGebQyHFk8Pu7O5mhLC2fTQwDh3umvJWmNh4pCVG8EHysU5/sD+JlXMRg7lynqTFBDX326zTGkOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596060659; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2LpyHTcPTlYdUaYntun2MIPNOdvzdJe2kAW1O4rp6g4=; b=bR/WzuEAoqVjwZF3h8wRDImTubDt+CJJhcke304fVMkNIcJCo4eaXFn6I69qAyPMkqDgCYUffJaugPcX2nV86A2NWbQJWo7HEPK4SiXNdU66GPcf5N1RPHOyc93XOD97xYrFP5B0TffXPj8I7ohpKjvjo2jGOOhzLziSd8DsCyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596060659084422.8934579829678; Wed, 29 Jul 2020 15:10:59 -0700 (PDT) Received: from localhost ([::1]:55116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uHp-0004PC-KB for importer@patchew.org; Wed, 29 Jul 2020 18:10:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uDs-0006uT-7c; Wed, 29 Jul 2020 18:06:52 -0400 Received: from charlie.dont.surf ([128.199.63.193]:34752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uDp-00005Y-UI; Wed, 29 Jul 2020 18:06:51 -0400 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by charlie.dont.surf (Postfix) with ESMTPSA id DE033BFD37; Wed, 29 Jul 2020 22:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=irrelevant.dk; s=default; t=1596060407; bh=VBVSWdNuq1ew5Oc+LN2Suo2nEIIo0N+RFktzz/ZMpwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SgGvhYa2ozTb3gVzQxuHrrzSiVodw2ldCtP/gsB/Pa2LnMHFR+fzzvbevzSt1gEoE HyrB/57AmZTgUNYJA/Q6yDoa7gv6XfVOZlPA5EYXWDpD6aBz0RexyhwNNZEwknhg2w JuFOsxctirc/6ERPOkiyHlD5mn/qBQujeANAuVCPJTJZdSC9u8XwguVcIKeEJmlUqY ymj7J2HC/rZAqH9y7IQhzoPFI9mdhvBYuCqkbw09JWxwpImfU/u8eM8Vf8J/ly4RgE yXHh+H1kibXDk5fpUhe1vap4Ik08fGO+gp0SCtQ9KOS1HUWmGdmAxaA3H9Ca59VFkw ecP1S+hvJwyQw== From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v2 10/16] hw/block/nvme: refactor request bounds checking Date: Thu, 30 Jul 2020 00:06:32 +0200 Message-Id: <20200729220638.344477-11-its@irrelevant.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200729220638.344477-1-its@irrelevant.dk> References: <20200729220638.344477-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=128.199.63.193; envelope-from=its@irrelevant.dk; helo=charlie.dont.surf X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 14:23:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Maxim Levitsky , Klaus Jensen , Andrzej Jakowski , Minwoo Im , Keith Busch , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Hoist bounds checking into its own function and check for wrap-around. Signed-off-by: Klaus Jensen Reviewed-by: Maxim Levitsky Reviewed-by: Minwoo Im --- hw/block/nvme.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 45e4060d52d9..c35b35ed41c4 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -555,6 +555,18 @@ static void nvme_clear_events(NvmeCtrl *n, uint8_t eve= nt_type) } } =20 +static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns, + uint64_t slba, uint32_t nlb) +{ + uint64_t nsze =3D le64_to_cpu(ns->id_ns.nsze); + + if (unlikely(UINT64_MAX - slba < nlb || slba + nlb > nsze)) { + return NVME_LBA_RANGE | NVME_DNR; + } + + return NVME_SUCCESS; +} + static void nvme_rw_cb(void *opaque, int ret) { NvmeRequest *req =3D opaque; @@ -602,12 +614,14 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNam= espace *ns, NvmeCmd *cmd, uint32_t nlb =3D le16_to_cpu(rw->nlb) + 1; uint64_t offset =3D slba << data_shift; uint32_t count =3D nlb << data_shift; + uint16_t status; =20 trace_pci_nvme_write_zeroes(nvme_cid(req), slba, nlb); =20 - if (unlikely(slba + nlb > ns->id_ns.nsze)) { + status =3D nvme_check_bounds(n, ns, slba, nlb); + if (status) { trace_pci_nvme_err_invalid_lba_range(slba, nlb, ns->id_ns.nsze); - return NVME_LBA_RANGE | NVME_DNR; + return status; } =20 block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0, @@ -630,13 +644,15 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *n= s, NvmeCmd *cmd, uint64_t data_offset =3D slba << data_shift; int is_write =3D rw->opcode =3D=3D NVME_CMD_WRITE ? 1 : 0; enum BlockAcctType acct =3D is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_R= EAD; + uint16_t status; =20 trace_pci_nvme_rw(is_write ? "write" : "read", nlb, data_size, slba); =20 - if (unlikely((slba + nlb) > ns->id_ns.nsze)) { - block_acct_invalid(blk_get_stats(n->conf.blk), acct); + status =3D nvme_check_bounds(n, ns, slba, nlb); + if (status) { trace_pci_nvme_err_invalid_lba_range(slba, nlb, ns->id_ns.nsze); - return NVME_LBA_RANGE | NVME_DNR; + block_acct_invalid(blk_get_stats(n->conf.blk), acct); + return status; } =20 if (nvme_map_dptr(n, cmd, data_size, req)) { --=20 2.27.0