From nobody Mon Nov 09 19:14:11 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 4jNfbR74Wnz70L7X for ; Mon, 09 Nov 2026 19:14:11 +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 4jNfbR5L1Gz4TW3 for ; Mon, 09 Nov 2026 19:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794251651; 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=D0Y92tsJs0QNu3tNJL8l2VaEBvPIFuTONL7/PG+tGpc=; b=PhtNQMzYaBmfeT8HlITeBcMAGkR2jrcsIlc+n/3tlNywLLRoua8P6+pgBQtB+lz35hF7eA LbhoKEqYmC0Ii7yts2Z/jp7obR458OWQ1bwSi5WcCOoL8R/CWAcif/UWUmvFLosbh/8ZJb pTTfyZUbSBGT7sxjo95AL3cLzPPQOjTt0RCGRpBuNxyhkbG+A3p2ycvP6RlpKf81xAoSz6 SjOkQAReYvTMo6A5aHi479KXiN2LMzUYIDLoiKWqDczo+OWCaQ5vZkL88w3lLpkWUBXtYi 8pbqAYaEOmtAZF4XdnlSrO4JHXnONwuIKeh+gNQEhdnN1UVphjGXJSKfvCqoOg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794251651; b=Mx5benI64vrPbVd39c8L/rjcEEA87VGG2B21pMkOAwvglgyOt5SfAhzWI7sgrbFVXyNeYb tfT4McsqC4wJv2ixqazxIEOIlBN7LMNuwG9vLJJxPy1BeeTPHvC/dOM3M2E4pRLSsWXx9O ekHzt97heFEyUJcJNfqZCBboFFxTHyl2n+B8ElC3WigSijJT2fLPtlPR0d3ZiYCRZDQh+C i+Jg+I1zoBo+aAej7UJ4SDjTT7OCSWS62uLa+CconDvsmvNiwGrhs+aHYc548OywGLjKR3 f8HQSJ50fgQSOUpQYajpFi1FBuPBp4ZJc5LKXIrPxKnZhFIbcffQANogbAVbtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794251651; 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=D0Y92tsJs0QNu3tNJL8l2VaEBvPIFuTONL7/PG+tGpc=; b=jKc2wDZBM56FUl+BsXESgUKIJ45ngI3qZsn49Iv1aD7JWcVlR4Yfr5CJaHNSP4/os5im/V jIcXip902lusT9/OI1WxFHpGmYkec8dIMtnjNC9fFhj3Vb/xT7aC8v0hhfhJzhUxHhqw03 JUYXSirDvlJBk5ZoNT2tJKE9QtfajPHWNFkRoVyCZMogyeikxwKyZBUMCXIDPhhmtMG6jL AKlnra2WSFqJh72wktVskqpNKfbLP5YXMVJIdzBpH5DjIXGpOdScLji2jTNMpbZjDMXvoD FvPFGuA/5y3ePYF/I7kZ0jGMbR7vS6AYwWrkQUPnMl/N7itQOzac7ps1JtBCWw== 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 4jNfbR4n65zvHw for ; Mon, 09 Nov 2026 19:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fbb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 19:14:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kenneth D. Merry Subject: git: ef69484b4295 - main - camcontrol: Fix swapped protection information defaults in nvformat List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ef69484b4295e84c74877b439db5caf025906b0c Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 19:14:11 +0000 Message-Id: <6af21b83.fbb6.3a0603ee@gitrepo.freebsd.org> The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=ef69484b4295e84c74877b439db5caf025906b0c commit ef69484b4295e84c74877b439db5caf025906b0c Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:46:59 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-09 18:59:13 +0000 camcontrol: Fix swapped protection information defaults in nvformat When no -p or -l arguments are given, the nvformat subcommand fills in the protection information type and location from the namespace's current settings. The two were swapped: pi was taken from the DPS metadata location bit and pil from the protection information type field. Formatting a namespace with protection information enabled would therefore silently change its PI settings, and before the Format NVM command builder masked its fields, a namespace with PI type 2 enabled would set bit 9 of cdw10, turning the format into a user data erase. Reported by: llm-postcr Fixes: 80f090111ae4 MFC after: 1 week Sponsored by: Spectra Logic Co-authored-by: Claude Fable 5 --- sbin/camcontrol/nvformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/camcontrol/nvformat.c b/sbin/camcontrol/nvformat.c index a41b490d62bc..777035812e6b 100644 --- a/sbin/camcontrol/nvformat.c +++ b/sbin/camcontrol/nvformat.c @@ -232,12 +232,12 @@ nvmeformat(struct cam_device *device, int argc, char **argv, char *combinedopt, & NVME_NS_DATA_FLBAS_EXTENDED_MASK; } if (pi < 0) { - pi = (nsdata.dps >> NVME_NS_DATA_DPS_MD_START_SHIFT) - & NVME_NS_DATA_DPS_MD_START_MASK; + pi = (nsdata.dps >> NVME_NS_DATA_DPS_PIT_SHIFT) & + NVME_NS_DATA_DPS_PIT_MASK; } if (pil < 0) { - pil = (nsdata.dps >> NVME_NS_DATA_DPS_PIT_SHIFT) & - NVME_NS_DATA_DPS_PIT_MASK; + pil = (nsdata.dps >> NVME_NS_DATA_DPS_MD_START_SHIFT) + & NVME_NS_DATA_DPS_MD_START_MASK; } if (ses < 0) ses = 0;