From nobody Mon Nov 17 12:06:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1603796886; cv=none; d=zohomail.com; s=zohoarc; b=K2Li2e8VXSxSEjwGDCXbzTutU8jwSes6gcISUHWBys5JFILAvbcJXIlnCCwnOsHoZmPQqWnRbT3FUl5Pbxf+7o5XmdgZaKH8FZsuI/Y+Odlx8K9fQrc7ZUQXcStpnNiGNE+B6FzhKAvH6jDDfEbPt1JBnZhdDK+k/72V9xmdbo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603796886; h=Content-Type: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=s2e8yoSa135asEbsyKVPTRi2H5U2ngmQmhUv9k2GW+s=; b=m6HsdL+NAy4YPWXYyKj090KxnTMbovBEcL6brfTB/NSEFvb35vh3esnSSO60ZFa05G5bhVurbbduRAw4bib71YIkfD1eJXQHCU0UNeLvVxvzuSduVw9aF0Z++mcMQRXimmCLR5IaODrI4Jq3AApDzMYSOqFt3FFHgaU6jtdpbaY= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603796886070900.7270041418652; Tue, 27 Oct 2020 04:08:06 -0700 (PDT) Received: from localhost ([::1]:47714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXMpg-0002TD-JR for importer@patchew.org; Tue, 27 Oct 2020 07:08:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXMXx-0008Ph-RN; Tue, 27 Oct 2020 06:49:45 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:52541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXMXw-000279-4e; Tue, 27 Oct 2020 06:49:45 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DEFC35C0159; Tue, 27 Oct 2020 06:49:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 27 Oct 2020 06:49:42 -0400 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id B795F3280060; Tue, 27 Oct 2020 06:49:41 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=fm1; bh= s2e8yoSa135asEbsyKVPTRi2H5U2ngmQmhUv9k2GW+s=; b=ogm5opOYGJzYMgG1 cuMa91uTP2Y5eKVA9reMgPv3ch81YM6+e8nomtlqS+UzyECVHbTCOeYBdyI2E5fU fWrkoizYaIuDJ0HLr44pI1ADi46P0Mx5gA+508FGi2rRRokyl5EGmdMpIqQ+F5lQ 9Jbn8yFrjE+BRiKbkkBqn/hKOkMGSvIzFo3eTNH4py97J5V1wkvVdtgsAhYvUBXt STuvqD027XRXq9agjkDD8VvRx8LWO2O8PbXQyvsZwxNwbWkqtsbBGCqeo7v03TBQ SS0d31XttZjkz8SRIwlSrAgUgn87NVjGxOT4i0z84L4HgQJyqb1bmqydhpdXWnFE rMgPjw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=s2e8yoSa135asEbsyKVPTRi2H5U2ngmQmhUv9k2GW +s=; b=VRij+Rbuhkq56Hms/TLV2bCaREWbAjnKGLUWjIci0G0ZZD/WVuR8YR+K4 vWnFxBruT05uRSrsd01VmlrEtvDCAb1hrk+0jjHTkrDCZ65H3AR8XwevtpCmMX9u Tf9eg71B2Bj+dXi28tfYMAxoFYQdHkB0jpQ9iohnQDtNGbT/6tzf4IjewpafczXY J0a+/WhauqXfq52DfKFl0/bsZH8U2IeVmROkCgBvYBxw7a+JboF/lv5glnln1W2C 521OiAOYnTbUA48XusUJ/FoqgZWNLWO3DwTvR88DDS8A2nkLdL1cpRdnh19krurD oMm3Gfo9gFNCYLxujzlQb8T11hIXA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeelgddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeetveeuudegveeiheegieelueeftedvtdekteefleegheduhfejueelvdfhffdt geenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpeefne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 07/30] hw/block/nvme: fix endian conversion Date: Tue, 27 Oct 2020 11:49:09 +0100 Message-Id: <20201027104932.558087-8-its@irrelevant.dk> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027104932.558087-1-its@irrelevant.dk> References: <20201027104932.558087-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=66.111.4.26; envelope-from=its@irrelevant.dk; helo=out2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/27 06:49:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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: Klaus Jensen , Keith Busch , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Klaus Jensen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen The raw NLB field is a 16 bit value, so use le16_to_cpu instead of le32_to_cpu and cast to uint32_t before incrementing the value to not wrap around. Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 59338b42328b..158843c14a29 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -645,7 +645,7 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequ= est *req) NvmeRwCmd *rw =3D (NvmeRwCmd *)&req->cmd; NvmeNamespace *ns =3D req->ns; uint64_t slba =3D le64_to_cpu(rw->slba); - uint32_t nlb =3D le16_to_cpu(rw->nlb) + 1; + uint32_t nlb =3D (uint32_t)le16_to_cpu(rw->nlb) + 1; uint64_t offset =3D nvme_l2b(ns, slba); uint32_t count =3D nvme_l2b(ns, nlb); uint16_t status; @@ -669,7 +669,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) { NvmeRwCmd *rw =3D (NvmeRwCmd *)&req->cmd; NvmeNamespace *ns =3D req->ns; - uint32_t nlb =3D le32_to_cpu(rw->nlb) + 1; + uint32_t nlb =3D (uint32_t)le16_to_cpu(rw->nlb) + 1; uint64_t slba =3D le64_to_cpu(rw->slba); =20 uint64_t data_size =3D nvme_l2b(ns, nlb); --=20 2.29.1