Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: kZpGICwW5mKVqbK8WsjuSYXsG6C4uRjcg9wMU1g+8hhV/GIgpN5/d8ygpf/PKChwPyK5Xl/LbX
 JPdy7yKvD1UJJoX2msRiNT5Nhd9jLDDbPGTeBZyBnW0HWjXUksb+fnHb0qnywGR0Mz5uMQ2/GJ
 fZnnwLlnBnsf5q6FunhEfd24zPfkq2U8nzf6IzVuZQa+yVwmnjik9P8RE+395ZnckJ+42ZKX1Y
 GEQ2qQmsWnLos1UKmZ6Y2PnMisKkhTA5flq/Y+ZVj0aMW3qWE1teZN6nViWk1hVRgkVMvfF5x7
 AsM=
From:   Niklas Cassel <Niklas.Cassel@wdc.com>
To:     Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
        Christoph Hellwig <hch@lst.de>,
        Sagi Grimberg <sagi@grimberg.me>
CC:     "minwoo.im.dev@gmail.com" <minwoo.im.dev@gmail.com>,
        "javier@javigon.com" <javier@javigon.com>,
        Niklas Cassel <Niklas.Cassel@wdc.com>,
        "linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] nvme: disallow passthru cmd from targeting a nsid != nsid of
 the block dev
Thread-Topic: [PATCH] nvme: disallow passthru cmd from targeting a nsid !=
 nsid of the block dev
Thread-Index: AQHXIVwH1ScTxDZzaECPp8Ru2XC2tA==
Date:   Thu, 25 Mar 2021 09:48:37 +0000
Message-ID: <20210325094807.328126-1-Niklas.Cassel@wdc.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 514b1b31-ce3a-427b-5e1a-08d8ef732a2b
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Mar 2021 09:48:37.9028
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: sUtf/79cOKFEed+KY+Sfk8SkSXlxfbQSTZWzj4lanat4ksIQn4H9z6tFD/pChtERgqBFlHMFVvMkAlMwv3R8cA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0682
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Niklas Cassel <niklas.cassel@wdc.com>

When a passthru command targets a specific namespace, the ns parameter to
nvme_user_cmd()/nvme_user_cmd64() is set. However, there is currently no
validation that the nsid specified in the passthru command targets the
namespace/nsid represented by the block device that the ioctl was
performed on.

Add a check that validates that the nsid in the passthru command matches
that of the supplied namespace.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
Currently, if doing NVME_IOCTL_IO_CMD on the controller char device,
if and only if there is a single namespace in the ctrl->namespaces list,
nvme_dev_user_cmd() will call nvme_user_cmd() with ns parameter set.
While it might be good that we validate the nsid even in this case,
perhaps we want to allow a nsid value in the passthru command to be
0x0 and/or the NSID broadcast value? (Only when NVME_IOCTL_IO_CMD was
done on the controller char device though.)

 drivers/nvme/host/core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 40215a0246e4..e4591a4c68a8 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1632,6 +1632,8 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, stru=
ct nvme_ns *ns,
 		return -EFAULT;
 	if (cmd.flags)
 		return -EINVAL;
+	if (ns && cmd.nsid !=3D ns->head->ns_id)
+		return -EINVAL;
=20
 	memset(&c, 0, sizeof(c));
 	c.common.opcode =3D cmd.opcode;
@@ -1676,6 +1678,8 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, st=
ruct nvme_ns *ns,
 		return -EFAULT;
 	if (cmd.flags)
 		return -EINVAL;
+	if (ns && cmd.nsid !=3D ns->head->ns_id)
+		return -EINVAL;
=20
 	memset(&c, 0, sizeof(c));
 	c.common.opcode =3D cmd.opcode;
--=20
2.30.2