From nobody Wed Nov 04 16:23:24 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 4jKW2j5Gxtz6y9rK for ; Wed, 04 Nov 2026 16:23:25 +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 4jKW2h3p4qz4k8F for ; Wed, 04 Nov 2026 16:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809404; 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=4jCl3vgo3XYEESVcJXHs4BU3+7BViupIdCBeqlVcGtU=; b=yF1CW9Y4KcU9GVq1TiHzikNXVnlkDAeFekpZ0BhCykYRWhPq0fF/VHSt6dA6iE3nfWEIMs T95TxiQrPnzRdNh4td65XbPkuQDoaLxq5anhFfMvEOoBXS450EQTYSeFr264gVsLLcc4/n oq9ZPKYF9MCdz2/treJgvjKzthnwbsmf0wgkXjnEdZL0SuZQ2PwsYF6vTnRS3B9OHeCjVp 0uXWIH2ISJJvi0hNM8oLl+ykIYR722jDMXlGW771+CfLyeYCgFCDFFJhBN+Wh+Uf2J3jg7 RY/SdE2vTrbODFg3CQESsS+p8dl4kUyZ1jW5k2YKz/JkWs8bw//gAD2uYnh+aw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793809404; b=rLIc4bbYEdGiUnQ36NEPbqouE39QYYElsl65rzdcj8Zici1Vvf3Eg7nqBvGNEVXs9t2TlY ribkjApitAWWNoDoGGBgAw+mDroLhfigkQrmXibQwTwFEmtGHf40y3HEFI3yohUIIYxF7u i4FUuFTstrZWhgaSqLevulHACbO72KuKIeaFP/M9hyybqZZbUVQegJaYsHUnrI8cFlGqpL QAmgcxz0o/iB5oYrk1XenOKtPPNM4jjug5VOtZMJcmXTkeBaCgTCOu3zHFic9Zb/9ILI7l dzQggZA3vdf/DGxAoHRZFs5mtZzcpp4Exw5qX8pz7cF4vKsoYQls/wIhWFMLIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809404; 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=4jCl3vgo3XYEESVcJXHs4BU3+7BViupIdCBeqlVcGtU=; b=gIc5OPO6NBPVuquXUcoiMPlUOFFFWn/T3EEFpPNVq3SRJ/zA/jRpNLyvScjA7iO7g1+7nt yWSxB/EcXxOCaTw8N1czz1+iDgf06c3NRdrzRk8TdFBUodUCucgqIxNVYNvt4LJkhMVxI3 5u+fDZyQbxPXMtMe/29u347rv5ZS1is+jtgVWkGf1tUcAWK1YP7/+/foedq9aFZX7NQzL7 1YAEaaz8PhJ9KLrAVB/S4FtYtlaCDBvNJgCJDs6U+4BkFghknSEMxLl2Bg0khrnPowyJXV csTlBCsTTQjO/y9yfkE5j9a57M1BKttq0VST6KyPf1vdgDXbOIKPmdsAN0tArA== 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 4jKW2h3Sb9z18bx for ; Wed, 04 Nov 2026 16:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20289 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 16:23:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b357c9444899 - main - cap_enter(2): stricter checks 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b357c94448997b1702c5d3be9cc3a9531ba92ffc Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 16:23:24 +0000 Message-Id: <6aeb5bfc.20289.5e9a3ede@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b357c94448997b1702c5d3be9cc3a9531ba92ffc commit b357c94448997b1702c5d3be9cc3a9531ba92ffc Author: Konstantin Belousov AuthorDate: 2026-10-21 21:57:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-04 16:23:11 +0000 cap_enter(2): stricter checks - single-thread the process Make cap_enter() a serialization point, ensuring that no threads are executing with old credentials cached after the syscall returned. - disallow entering capability mode if the file descriptor table or pwd are shared. They are shared after rfork(2), and allowing it lets another process grant additional privileges to the process in capability mode. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60963 --- sys/kern/sys_capability.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index d43102ab7849..e7187b7904ee 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -102,19 +102,35 @@ sys_cap_enter(struct thread *td, struct cap_enter_args *uap) { struct ucred *newcred, *oldcred; struct proc *p; + int error; if (IN_CAPABILITY_MODE(td)) return (0); - newcred = crget(); + error = 0; + oldcred = newcred = crget(); p = td->td_proc; PROC_LOCK(p); + if ((p->p_flag & P_HADTHREADS) != 0 && + thread_single(p, SINGLE_BOUNDARY)) { + error = ERESTART; + goto out1; + } + if (refcount_load(&p->p_pd->pd_sharecount) > 1 || + refcount_load(&p->p_fd->fd_refcnt) > 1) { + error = EBUSY; + goto out; + } oldcred = crcopysafe(p, newcred); newcred->cr_flags |= CRED_FLAG_CAPMODE; proc_set_cred(p, newcred); +out: + if ((p->p_flag & P_HADTHREADS) != 0) + thread_single_end(p, SINGLE_BOUNDARY); +out1: PROC_UNLOCK(p); crfree(oldcred); - return (0); + return (error); } /*