From nobody Mon Nov 17 12:07:12 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=1603800320; cv=none; d=zohomail.com; s=zohoarc; b=WQ9gB6sI26H/nwfsxPKNoLx5UADaz9b1nqipnywSGsPHXecn/tcqzOnyzkPZeqWzJoohh1C6EtrU/+aSb7xQsYgl1Jp3u04gLm6IPlBYqfxR2Ao+90v/jk3fFQIpGWOoFpf69A0kLNEbA8pbDafriywJpFVYSG5VEj82G+9CnH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603800320; 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=lu7JmQcZOw4I1V7ibvxCl25CM11aBSCNkyNgQVlyLp8=; b=c0cJdz69aQK9DES1yTmCMwCIEiWJr4s3WbTV20dShrq5HAbNzzzBhhXubo/b34sMfX2giYfxq5/1qOe5K6rSsJyWqFPmPlFVIpz6kSu6DaF7IVOAE5fzQDkiwLETCgUMeKwKxCFEfcvujwaJ4cX0Zwfmfdoi2KrjPnH8ah6mhyY= 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 1603800319873801.3784657870109; Tue, 27 Oct 2020 05:05:19 -0700 (PDT) Received: from localhost ([::1]:58910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXNj2-00032O-0N for importer@patchew.org; Tue, 27 Oct 2020 08:05:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXMYr-0000nC-Ng; Tue, 27 Oct 2020 06:50:41 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:59291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXMYo-0002JO-DI; Tue, 27 Oct 2020 06:50:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 080735C0175; Tue, 27 Oct 2020 06:50:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 27 Oct 2020 06:50:10 -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 D4FD93280060; Tue, 27 Oct 2020 06:50:08 -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-transfer-encoding; s=fm1; bh=lu7JmQcZOw4I1 V7ibvxCl25CM11aBSCNkyNgQVlyLp8=; b=TpJXW4tenTQ7NxKIvMJDKrCeinTG+ Waz2ZAqC0dN+fdlcSCG9F8iUDwyvxQbWJvPC/3lc+O2iwE7FzA0QakP4hJ8bsmaV 5Z/5Cjq1AJmb+pSqLdQdEfcer0MXk+LV4PJmwloJDQhoL8aVp9n9WjdJjDjWvNG+ H/kF+dgfhc72g8BbioN4Ag5Psn6xryM2cbe1NizXFd0CxRtAovKEG4CXe8ACZ6h6 x6erMqHf3AZ/BbRYYBh4wbXRQUUytqVihRLNUmODyJSGXcPL7GNHkCdXWgh5mu8T 1mt+frU9AW5IyOktcsKIiltrAYVylUINZYoXCYoaiLoau6Z0AEcVG79mA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding: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=lu7JmQcZOw4I1V7ibvxCl25CM11aBSCNkyNgQVlyLp8=; b=F9lZgACL WQKJNJnBIQH4a3t8u8FrtAtOiVvLCRYwljOH1pzghpCPcNm5zWGRTWIDswcrUzXd Y5XJOCVPViRDFLZi9pR6e2pt3HHFC2gN0Io6tQ6WgSWYCP60mPUSvJmGQepLxNpN pVoNx7Yf/q5+CnRn42dN/X6acSyQ9dWLPKCp8e9nB1XKzoU5ZsGdzy2TwGBOQR8X K5S4yOyQ5NKxHt6X/eNMZdnIMSgWwbxoR5PZNuEpfFERd9G+ipmnJwJBqC5zXH7O dmGM+BgLQMra6bDWHo6vl1a3Q9Pyl0ejE8o6Db50wiSQIHOefn4K6WvBNxc2L2Rf tXvB7/H4K/MbLQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeelgddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghushcu lfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrthhtvg hrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffevgfek necukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgepudegne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 30/30] hw/block/nvme: fix queue identifer validation Date: Tue, 27 Oct 2020 11:49:32 +0100 Message-Id: <20201027104932.558087-31-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-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 , Gollu Appalanaidu , qemu-block@nongnu.org, Klaus Jensen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Gollu Appalanaidu The nvme_check_{sq,cq} functions check if the given queue identifer is valid *and* that the queue exists. Thus, the function return value cannot simply be inverted to check if the identifer is valid and that the queue does *not* exist. Replace the call with an OR'ed version of the checks. Signed-off-by: Gollu Appalanaidu Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch --- hw/block/nvme.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 5dfef0204c2c..fa2cba744b57 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1143,7 +1143,8 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeReque= st *req) trace_pci_nvme_err_invalid_create_sq_cqid(cqid); return NVME_INVALID_CQID | NVME_DNR; } - if (unlikely(!sqid || !nvme_check_sqid(n, sqid))) { + if (unlikely(!sqid || sqid > n->params.max_ioqpairs || + n->sq[sqid] !=3D NULL)) { trace_pci_nvme_err_invalid_create_sq_sqid(sqid); return NVME_INVALID_QID | NVME_DNR; } @@ -1398,7 +1399,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeReque= st *req) trace_pci_nvme_create_cq(prp1, cqid, vector, qsize, qflags, NVME_CQ_FLAGS_IEN(qflags) !=3D 0); =20 - if (unlikely(!cqid || !nvme_check_cqid(n, cqid))) { + if (unlikely(!cqid || cqid > n->params.max_ioqpairs || + n->cq[cqid] !=3D NULL)) { trace_pci_nvme_err_invalid_create_cq_cqid(cqid); return NVME_INVALID_QID | NVME_DNR; } --=20 2.29.1