From nobody Wed Nov 11 01:07:03 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 4jPQN73cXGz6y1t6 for ; Wed, 11 Nov 2026 01:07:03 +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 4jPQN70nQzz4nlQ for ; Wed, 11 Nov 2026 01:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359223; 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=rHG5NLXdZtEp7fNmrPnzHyAkzgXMdhyXwKi/0oeq6nw=; b=eoB2DakwoaipTG97lpUPKcTLq11DtPGrPNSJdHVKa5GuF9iCBJDkPRzhurIx4fUslsVWXn iZvipMoNuHhdhlFCWEcqih0NzppCrsbN2Pkglhg4ri/9066PtT1OxO8SMSsYP9CV9aprS7 utDu9i9AsTB0UyokE6Q0JiLqgeyioiHIojZVyimLEj+77iFfLakCV0lPtkGaICWohLNCRk NAR7IIUm4/NOfiO1RZm8l0rrI5v4YkPTA86lO5qa0Obk6DnaqfGVSpLMNCrF65pKWSruT4 wxKt0JytdjMMruYaevE+oeXJVJe6Z7sHKEb/JoZDFYuLDYvurcoxJrQ+JyWNuw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794359223; b=RUUmFwdhd9mlQdWfkDYTmYB6E9tCfM0w+C/EYs7WLrcCBdCtklbIgCFU555/ozSRfLac5M XTv7A6iuCvpE/tynmDbL8jmpxaEf6k68eqvLxQTqFVdkABYObFGyS+/6LIU/HaFGm87Z3L /JEklj3nPLR7huNt1Kz2dgYjUa2imzO3gqNUIR1LOP/8DYK2szfw57MKlmsYrQDO0VysVi n5MtEjSMVlZ1ruvU6C/gnqPzbT84dvaUFAt7Wn+g1ev8yfStCsGTVVKIzxidWScudivGIe 8qbJhRcF18+QS4KHTzhM9KXb9nunqpg9AA5NqgrFmj6HFQ+8Wn4ldGosCsXl1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359223; 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=rHG5NLXdZtEp7fNmrPnzHyAkzgXMdhyXwKi/0oeq6nw=; b=ZFmrMhZ/SZjTe2MtbYl+XforITCzLTcjG6z0OV79vjr+DZg2pILtWs//nylxEeDEiIB89N Pjl1s6a6nmZOYR1wEa2k7i+2t0G2rma0hX3IQuqDdzuU13cxepBoof1+vSpGH6zJsLpXY4 9PqNVpi61h70hYKd7NQ9tAG0ul4oiw/d4HwCGDWoYorBbfkHTQveHCOmvqIK1KdaFph5Df 9f4K9EOZb94f50OpxGfgnUQ1R1lqP91eavAJOtxv38jOs2eeBAOy024C8iWJtCpkN9rXNl umlgJHDmNKUz1KPleaAcKjgtWSa9CKFjpzWYvo6PRGHXi5PvjnLpcjjIAOVVqA== 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 4jPQN70SHlzsJN for ; Wed, 11 Nov 2026 01:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 224ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 01:07:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6a3815352cb4 - stable/15 - cap_enter(2): stricter checks 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6a3815352cb4a131d6dd9a9331a455f371d9c23f Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 01:07:03 +0000 Message-Id: <6af3bfb7.224ee.77d7ad9e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3815352cb4a131d6dd9a9331a455f371d9c23f commit 6a3815352cb4a131d6dd9a9331a455f371d9c23f Author: Konstantin Belousov AuthorDate: 2026-10-21 21:57:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-10 19:53:57 +0000 cap_enter(2): stricter checks (cherry picked from commit b357c94448997b1702c5d3be9cc3a9531ba92ffc) --- 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); } /*