From nobody Mon Nov 16 21:00:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jT0dD12Pbz70wlc for ; Mon, 16 Nov 2026 21:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jT0dC65qnz4CbP for ; Mon, 16 Nov 2026 21:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVKmY0ICP6WQtTs42hxju5Yjw+1Iihgypreu1Uc+faQ=; b=l0g5ivGr0jGUdF9moVpNlUAJDXHV2LJIdTRBHml5IkrT+6qDQT2jRRxc3mw7dSMxtGHsEw lg8lIkNxOAfWDoDR8subBFNI0Do8kqd5v8aNZVx0MxKmQ0dMnefzJY0Gqg7CzyEUUK253I +YZ6MGnsLDizZnJyyNP8RK1fLkipWSY4HVA5z9+hnvGRVArp/lHi2gP9BFYeJkH0Z9j9aY 3k+CFfsDYQit2HV1iZ3OAN/h4WJlquBOiHJgCVWy3me4v0C+rQM9U9BCEeqPJ3oeyJJThz Y4LHi70fNC/VmwoQ8uruXOQ3+ggqm/1mtTRR0bS3WFlSiUKWqmHw/McSMPJC1w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862847; b=JhFbN6/bHo9e9NAHbojnuE59gkfkXM14BcGpUwFlXUsdH9vsLhSmgeL9bstT28EjxPiCh8 9ePPhUJmw1GfE2X+rlo0bJPaa+g9pJofOLo87btXv/fnWGv8IrGw4MRT11iqIXSmRhOvrp wSVO6R+SIoOTKMF+DbZ8VvnzBcDUvQz//BdgzELdbi44BeBPvGEDYKhpX1jBTWPkRhiAId 9vwTa2LScG6lroOvUuRhrVgWYZ9Lvj/hC0hp1DMwcl3LEfgBMxGJdvtaRtxsgDKwq/H55I r2izu6kFJuXANRBYHFnF17WyajbKdf/E2l1AXs75qmJg6yDVmrkUBZJKEjsaXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVKmY0ICP6WQtTs42hxju5Yjw+1Iihgypreu1Uc+faQ=; b=JBTa5U42PwbBF5VH5BFAnlWhHXp2FnSeYdJtDDB6EBL9adUXjc6dTEceMMRZ3qOYeJZKZ9 jywRO+l92PQq9Ia4Uu84zvjkz9JP00peaNkDR//xhdqOoqbQUqoa55uvmUE+73UGsW+/5+ VkO2hdlzR/8HBBpuJUuzwbXlX2icUFkyHDHDQnY54nJBovjruojiJccPZqKhrFjJK4PWBh Hu4auXYxKwQ2r2uZbMQQ2525SZJQ3mZ058vT+ZEULOxOBs0ps0bE36QnWQpbNcmaZ6YYQ0 dpqExpyP0Twd3CHVLwbCx1UeK5B22Sn6DV1IYcTa91DS4DtJ3pzfK8gWGaIczg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jT0dC5TP9z19QR for ; Mon, 16 Nov 2026 21:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 7f63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:00:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 6cb4db4dfa07 - stable/15 - nvmecontrol: Mask the fields in the Format NVM command List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6cb4db4dfa073628865454eb89275cf5d2d26eff Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:00:47 +0000 Message-Id: <6afb6eff.7f63.758b62dc@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb4db4dfa073628865454eb89275cf5d2d26eff commit 6cb4db4dfa073628865454eb89275cf5d2d26eff Author: Kenneth D. Merry AuthorDate: 2026-11-09 19:35:00 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 16:13:46 +0000 nvmecontrol: Mask the fields in the Format NVM command The format command composed cdw10 by hand without masking any of the fields and with no support for the LBAFU field. Since commit 2c41f7d8a034 the LBA format index defaulted from FLBAS can exceed 15 on an NVMe 2.0 namespace using FIDXU, and such an index would bleed into the MSET and PI fields. An out of range index supplied with -f for a whole-controller format was not caught either. Build the command with nvme_admin_format_cmd(), which masks all of the fields and encodes LBA format indexes above 15 in LBAFU, and reject LBA format indexes greater than 63 for whole-controller formats. Per-namespace formats already validate the index against NLBAF. This is the same problem that llm-postcr reported in camcontrol's copy of this code, fixed in 3892a6453fc6; the unmasked composition originated here (635c517ae9ca). Reported by: llm-postcr Reviewed by: imp Fixes: 2c41f7d8a034 MFC after: 1 week Sponsored by: Spectra Logic Assisted-by: Claude Fable 5 Differential Revision: https://reviews.freebsd.org/D61356 (cherry picked from commit eae727676169de58052fd512ebb0ee565ad6e246) --- sbin/nvmecontrol/format.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index f339acc6e305..741a69412e58 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -191,6 +191,8 @@ format(const struct cmd *f, int argc, char *argv[]) /* We have no previous parameters, so default to zeroes. */ if (lbaf < 0) lbaf = 0; + else if (lbaf > 63) + errx(EX_USAGE, "LBA format is out of range"); if (ms < 0) ms = 0; if (pi < 0) @@ -200,10 +202,7 @@ format(const struct cmd *f, int argc, char *argv[]) } memset(&pt, 0, sizeof(pt)); - pt.cmd.opc = NVME_OPC_FORMAT_NVM; - pt.cmd.nsid = htole32(nsid); - pt.cmd.cdw10 = htole32((ses << 9) + (pil << 8) + (pi << 5) + - (ms << 4) + lbaf); + nvme_admin_format_cmd(&pt.cmd, nsid, ses, pil, pi, ms, lbaf); if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0) err(EX_IOERR, "format request failed");