From nobody Tue Nov 10 20:04:53 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 4jPHgT2Rcyz6vN3S for ; Tue, 10 Nov 2026 20:04:53 +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 4jPHgT21Dzz3QKf for ; Tue, 10 Nov 2026 20:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794341093; 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=hudtTW+kngPe+v9c9jKwtrI5W9ZFFfrruhIG2X6biug=; b=oXIuq0LiLLlRuJ5qvEvl0ZNYDkWTpa8WSG6s21a43Ok+GlcbFjhcqdtpNvkPp1UKoWgGa9 I5kwr+gP+DFtF4QE7z1iXF7lEJRck7gY/B91aucJGQ7KWvY+WNSouUWoP17HvdlNxstbsv M2vfpSdYCBeNeFw+C0AMJSRQFBm3ly8kPnXITtw5VgbXZHQrAaJ7Z/J2w6WAmLCqh7nYmm +gr2pInNmNZh9jXYxgun1axca0ksvLTkf8I4UkY6vrhGJ0yyk7eBwKcC0vSIKYmOXuSIJq ZN32KyaMJ3WfM/d74dOlLkvWg/FasrfkR3a8z7ca6DEGDf3dYwzkrZt+E6sI9g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794341093; b=tnwG5QT9y8dRK+Mzjk7eUve3doI7lpsNPMDwR4f7yxPoIjoMuWJslueFRUqjXZB7A+Q8zD Tqhm12Zepci7VbAPdnS/xh4gv2rK+Jab3em8xQ9XWVKJqgIqeXtgCf93X6zYRKneeEMlpr /U1HFfAutjo1UbiVVPKIxSK6NKLwqgz9q9M6RHdVl+bhucdWncByexupsXbfYdldIWUHgD TRiDQeYjr6zXzFfC9W1FLKiZstKDR+JYivc1bdi6vgntR95RZy4PGdwXPxwB7r9uEsKEqN nR/+Nubd3aRFclJPT4JgtQz4gRHrT9iT2q9orcdYFiQ5/lHxdp0HobgN4VlCqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794341093; 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=hudtTW+kngPe+v9c9jKwtrI5W9ZFFfrruhIG2X6biug=; b=YcOKrxNPN7gf0J00pLlIKDjSApHJmwmBEch6vOlXzdZkRjxMXGCs+g6twx99+kgXfeUjB0 HZOsOmlWHc/vE9R7O6RMrMMWCeTy+b7P8kazj9/6jIfewV2EEWyga3GeaNfbht7YTPlJTe RGaRoLF0pQh/90H0yRFZYUZdqcg8s1A/W3EJ0sZhU0FqrLSarkAYwUNKQVGQvpHjD8vJqW MLb0NZVqAwfwiTKpomxF6oxYx0m6qkeMoKyiL5sSEPDoz1qNP39WxcyLoYyZhiY7hzBn2g jDL0wYGv7uCbWztyZfhTWACxlJ9Jsc+VlTaZP5ca3nXNMtcfRHNqr9PVMVJJxQ== 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 4jPHgT16yjzkHm for ; Tue, 10 Nov 2026 20:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 20:04:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kenneth D. Merry Subject: git: eae727676169 - main - 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/main X-Git-Reftype: branch X-Git-Commit: eae727676169de58052fd512ebb0ee565ad6e246 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 20:04:53 +0000 Message-Id: <6af378e5.2b23.7169f769@gitrepo.freebsd.org> The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=eae727676169de58052fd512ebb0ee565ad6e246 commit eae727676169de58052fd512ebb0ee565ad6e246 Author: Kenneth D. Merry AuthorDate: 2026-11-09 19:35:00 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-10 20:04:33 +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 --- sbin/nvmecontrol/format.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index 2efc0144c232..62dd56a5a81e 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -190,7 +190,7 @@ format(const struct cmd *f, int argc, char *argv[]) struct nvme_pt_command pt; char *path; const char *target; - uint32_t cdw10, nsid, scan_nsid; + uint32_t nsid, scan_nsid; int lbaf, ms, pi, pil, ses, fd; u_int i; uint32_t sector_size; @@ -312,6 +312,8 @@ format(const struct cmd *f, int argc, char *argv[]) } 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) @@ -320,20 +322,17 @@ format(const struct cmd *f, int argc, char *argv[]) pil = 0; } - cdw10 = (ses << 9) + (pil << 8) + (pi << 5) + (ms << 4) + lbaf; + memset(&pt, 0, sizeof(pt)); + nvme_admin_format_cmd(&pt.cmd, nsid, ses, pil, pi, ms, lbaf); if (opt.dry_run) { printf("Format NVM: opc=%#x nsid=%#010x cdw10=%#010x " "(lbaf=%d mset=%d pi=%d pil=%d ses=%d)\n", - NVME_OPC_FORMAT_NVM, nsid, cdw10, lbaf, ms, pi, pil, ses); + NVME_OPC_FORMAT_NVM, nsid, le32toh(pt.cmd.cdw10), lbaf, + ms, pi, pil, ses); close(fd); exit(0); } - memset(&pt, 0, sizeof(pt)); - pt.cmd.opc = NVME_OPC_FORMAT_NVM; - pt.cmd.nsid = htole32(nsid); - pt.cmd.cdw10 = htole32(cdw10); - if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0) err(EX_IOERR, "format request failed");