From nobody Mon Nov 09 19:14:12 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 4jNfbT1TLPz70KtJ for ; Mon, 09 Nov 2026 19:14:13 +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 4jNfbS62R4z4TJS for ; Mon, 09 Nov 2026 19:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794251652; 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=O+ORBMJVp6XYMZJcQsHh6p7CwXGbB33JBnD+cC7i2Mg=; b=PGQMT45WpQ+h6RyhwtVYoE/wPe5VY+be0OZv2CAEBj+Nib6SbwHYYjVEmrDW6w5JYR8Z1g 3X4beYxeAiojhkFprhKorAGtn6mWBJknIm64U7quN/Q2t3HQXDOjvh0eEwUWOZFglXOshB 4nv0IZlpEX4t9euQDr0BQHicvYCn1s6eviSEQb7gq2VktLCfEaYUDhwgdjtYXfikJIpN0L NYuXALw8Fn3nmXByxjQGGY4ZV/Wr7/o8aaQ8K6RdkL1njK4WqOpfMjVBPkBPJVwkibJ7XD r0XU3PsNRx2+HChA2Mu84qrN2LaaeBGhJzqFggcvZF8RQs58ZqvwpRcAIFWhcQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794251652; b=EfE566Jigf4ikNgh1wWwMAUGcoxHgBe2jC1yoqU0LtVvkPBQ2YdJNMhIr+jeocUyRVPiE4 vrNdzh+7UqrMTQ5+78pyuoU4JfEyCxQgYJYmqig2pP9vL+b6HamtsNaJXFheg4x5+deVOE RFJkXKzrwIou7gMiyF5ugdCeS3iPzPHHiJvh3pgp+duyMlb9BWV/NhEfgqwuv9sBBq6Hvv 6L73oMG5jpM1lX3NvRMoR13P2Ty6OH9fjrnUzwZ/zrusOfoX5YFQRxMRxWxsjkglS202EY BglTmd4zHsNWyINYaJ/4cJQvKZ+MTeX1BSkuhwoJIAOqFbq9LFfg8MrVSufTNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794251652; 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=O+ORBMJVp6XYMZJcQsHh6p7CwXGbB33JBnD+cC7i2Mg=; b=E5UMaHDFm4vjM6rNQK6yt0XAT8aTkbzXTFB7QiT8dCC3dHTQHIGbKl0bp9C+hzEu0Qi6n0 H8jQP32c5q6jV8Hj32GPX2A3aYtZcOQf/Gnxh3CaQ/sXsLClvs4npFEQE0qadL41D6QjNt 8eYF8cs41xcK8Omxc3gu7ZuVGG9xuHZ55SeDTNjpTAPRBGxZbccdxhNt+gGKh4F0gBkrw3 CBLHL94Y2OP6IjKttLa1aTOW2a82qadUZ0cDdd2XuJOGM70E67y+BxbkvBjtJ5DKwj4JNk HPljeIDyZR2Ebof4NjmraZl8gtEvx69mi+FbykYa4BBv8jZjKJv3WzVF5ulW0g== 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 4jNfbS59v2zv0n for ; Mon, 09 Nov 2026 19:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d7c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 19:14:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kenneth D. Merry Subject: git: b95e2b2ce907 - main - camcontrol: Require a reservation type for reserve, preempt and release 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: b95e2b2ce907cde89bc3e7be2ffeae03cfed55ab Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 19:14:12 +0000 Message-Id: <6af21b84.d7c3.11e2d273@gitrepo.freebsd.org> The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=b95e2b2ce907cde89bc3e7be2ffeae03cfed55ab commit b95e2b2ce907cde89bc3e7be2ffeae03cfed55ab Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:47:00 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-09 18:59:13 +0000 camcontrol: Require a reservation type for reserve, preempt and release res_type was initialized to 0, but the checks that enforce the -T argument for the reserve, preempt and release reservation actions compare it against -1, so they could never fire and camcontrol silently sent a reservation type of 0, which is invalid. Initialize res_type to -1 so the checks work, and default the reservation type to 0 for the release action's clear variant, which does not take -T and ignores the field. Reported by: llm-postcr Fixes: ba75cf05727e MFC after: 1 week Sponsored by: Spectra Logic Co-authored-by: Claude Fable 5 --- sbin/camcontrol/nvres.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/camcontrol/nvres.c b/sbin/camcontrol/nvres.c index ab6132d45fde..1145278356c3 100644 --- a/sbin/camcontrol/nvres.c +++ b/sbin/camcontrol/nvres.c @@ -450,7 +450,7 @@ nvmepersist(struct cam_device *device, int argc, char **argv, char *combinedopt, int eds = 0, cptpl = 0, iekey = 0; int error = 0; int in = 0, out = 0; - int opc = -1, op_action = -1, res_type = 0; + int opc = -1, op_action = -1, res_type = -1; int c; while ((c = getopt(argc, argv, combinedopt)) != -1) { @@ -659,6 +659,9 @@ nvmepersist(struct cam_device *device, int argc, char **argv, char *combinedopt, error = 1; goto bailout; } + /* The reservation type is ignored for a clear. */ + if (res_type == -1) + res_type = 0; break; }