From nobody Thu Oct 22 17:32:10 2026 X-Original-To: dev-commits-src-branches@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 4j9YB315Lnz6xPVB for ; Thu, 22 Oct 2026 17:32: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 4j9YB261WLz3H7D for ; Thu, 22 Oct 2026 17:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690330; 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=tqzrIQbdghY4lkfSBjmclZgzRImjNGTF7amMQk83O10=; b=iXRImTOlvFmSTuOO1Vq0IzLxDpMIQ+ZK6RwK3vrNroDNaiRs3XLp3m07R5L87D/KlXw3iE nVXflV9tzLFP/hADPyozugYdQC7CW8g3rihxF+B5Np+sh/+5NDNW5G6wxkn0gXg9JpxAp/ oz4ndTCdAlC6rxyyRo1cHm3ZI9aQB49J4Y6FQstQn4dxGzsXfYT4ST2FrgMrbQDxN6U6aD lpAWoH1JvOyq3QZqldVt12RwpJzaHtbFdSR5/SeI8Dfjj5lWVzBIp5clIbps8kRnFO53JG JxTzXG//ivo4HSHy0FXoDSAvQ7SssfDe3HuxEBn3TqnCqvNGqNBZRcbry13hFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690330; b=lyNCICQVk25rIBDHAkFOD7sAcuLJJ67e2ueaXvu14FvQPXHT4v7+H/aRCrO9zNBFYyirWr 7718E6SUxwKSztHHc4i7GJJjPgTJ1Ca/XTY5Aiy0kC5Ww5ufz1dNdk5monJTSkx+/aMGYh o8EvtMneZcCLiskXSt+EuNpa6nfH+3S0dBlwhnME5C67ZPVo4Cq2wjnhfcti/bgMJLx7Bm 2hdcK2cGGlHFWlG1PSRU0IW35xML8SiUvYEv2VUcFUJ/tPv6++uP8QrJ3z1z5ICN0cEnOC gN3zIIUb4eJhC3cb9H2Qimwe0Ygf3/egEXt0UT2WFW0Ujn5z6yt406YgbJ7HTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690330; 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=tqzrIQbdghY4lkfSBjmclZgzRImjNGTF7amMQk83O10=; b=MOOpxcqDeylPatiXxPxA6lHuwkBdEJyVbJfNG7rLNc3pU4WVckpPkWAhCduYFU4LRRcS1I 5/uJxpsWPnmuFlfU0D7s9EQdDX0W2oDm0WJOoJUofF+ItPEQmbZJuhuuLWHNRc5IXkniWC fZI0wMMw2CvUdFwmTebWMtUUCoamJv2eCcYOdFGgjGTCbbRqiIQwf9PPqiy5FHXiutqvGs pmOeWU2fY5COehiow7XfNlzikOc5n9UwWGBKlbRviOl5QJnrziqABGymFT83e8LvTCpRFU 6AWQUr6RVwqoRW/EVExs7oquCZ/Wu1yuZcbimjFgBimUKx0+oYvBbSHDE95qUA== 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 4j9YB25VlKzsJH for ; Thu, 22 Oct 2026 17:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e64b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: feb193187bf0 - stable/15 - sysctl: Return ECAPMODE when trying to access sysctls in capability mode List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: feb193187bf059a3d9498d383b719544d6c42de0 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:10 +0000 Message-Id: <6ada489a.3e64b.f0dc1de@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=feb193187bf059a3d9498d383b719544d6c42de0 commit feb193187bf059a3d9498d383b719544d6c42de0 Author: Mark Johnston AuthorDate: 2026-09-28 21:59:40 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:41 +0000 sysctl: Return ECAPMODE when trying to access sysctls in capability mode We have always returned EPERM in this case, but it's incorrect, we should return ECAPMODE for capability mode violations. Fix the errno value. Reviewed by: emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D59887 (cherry picked from commit a76e986470f86731dd3a5f9eeae1ba28b8b160fb) --- lib/libc/gen/sysctl.3 | 3 +++ sys/kern/kern_sysctl.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index ef897c653728..6b87ec8bbd1b 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -950,6 +950,9 @@ array specifies a value that is unknown. An attempt is made to set a read-only value. .It Bq Er EPERM A process without appropriate privilege attempts to set a value. +.It Bq Er ECAPMODE +The process is in capability mode and the variable is not accessible +in capability mode. .El .Sh SEE ALSO .Xr confstr 3 , diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 51a6530ee522..b5449af5d32e 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2370,7 +2370,7 @@ sysctl_root(SYSCTL_HANDLER_ARGS) if (IN_CAPABILITY_MODE(req->td)) { if ((req->oldptr && !(oid->oid_kind & CTLFLAG_CAPRD)) || (req->newptr && !(oid->oid_kind & CTLFLAG_CAPWR))) { - error = EPERM; + error = ECAPMODE; goto out; } }