From nobody Mon Feb 9 06:49:10 2026 Delivered-To: importer@patchew.org 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; 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=1584377024; cv=none; d=zohomail.com; s=zohoarc; b=n1uftmhdsoQa6cKzpYBTKZbWovNiohprq69KgBujUOFQ0GBt0wR5QQlm2Ac6on36EDbSsv1gTLrKeMx8Xy21Bvio2kmxNXEkHXoAA4jj9k6h3D3f5+earvhqY+i8fJ0+c0TBCCgPC9HY3k19EF0YFJr48zkf9ZDYfpVYWsOFwW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584377024; 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=twkfNM6IlGU7OanMr0dIGQP/0ecrMGDf4GWZGSvMrRI=; b=P5+qL2gQPkLq9NSiCa5DiQj8fLjFdBZquRXRCDoUegzdiIUvRzk5zy4ChH6RvJets5fEon3/d/8CtD1adxA5KIUvUQ5MxqFcdaFOgXI2urxQ6IL2HJ1c3IeJDR/hcDar5wK5hPqocm697OKVtsYRrQU8nD1x9iUs7E//uLXH4yE= 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 1584377024731190.7083011049923; Mon, 16 Mar 2020 09:43:44 -0700 (PDT) Received: from localhost ([::1]:42560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDsq6-0007c2-Jk for importer@patchew.org; Mon, 16 Mar 2020 12:43:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53470) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDqkr-0000AI-R7 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 10:30:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDqkq-0002V6-Fp for qemu-devel@nongnu.org; Mon, 16 Mar 2020 10:30:09 -0400 Received: from charlie.dont.surf ([128.199.63.193]:48582) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDqkn-0007p5-0R; Mon, 16 Mar 2020 10:30:05 -0400 Received: from apples.local (80-62-117-52-mobile.dk.customer.tdc.net [80.62.117.52]) by charlie.dont.surf (Postfix) with ESMTPSA id B42D5BF5E1; Mon, 16 Mar 2020 14:29:43 +0000 (UTC) From: Klaus Jensen To: qemu-block@nongnu.org Subject: [PATCH v6 16/42] nvme: make sure ncqr and nsqr is valid Date: Mon, 16 Mar 2020 07:29:02 -0700 Message-Id: <20200316142928.153431-17-its@irrelevant.dk> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200316142928.153431-1-its@irrelevant.dk> References: <20200316142928.153431-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 128.199.63.193 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: Kevin Wolf , Beata Michalska , qemu-devel@nongnu.org, Max Reitz , Klaus Jensen , Keith Busch , Javier Gonzalez , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen 0xffff is not an allowed value for NCQR and NSQR in Set Features on Number of Queues. Signed-off-by: Klaus Jensen Acked-by: Keith Busch Reviewed-by: Maxim Levitsky --- hw/block/nvme.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 85c7c86b35f0..e56142c4ea99 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1155,6 +1155,14 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCm= d *cmd, NvmeRequest *req) blk_set_enable_write_cache(n->conf.blk, dw11 & 1); break; case NVME_NUMBER_OF_QUEUES: + /* + * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for= NCQR + * and NSQR. + */ + if ((dw11 & 0xffff) =3D=3D 0xffff || ((dw11 >> 16) & 0xffff) =3D= =3D 0xffff) { + return NVME_INVALID_FIELD | NVME_DNR; + } + trace_nvme_dev_setfeat_numq((dw11 & 0xFFFF) + 1, ((dw11 >> 16) & 0xFFFF) + 1, n->params.max_ioqpairs, --=20 2.25.1