git: 6a3815352cb4 - stable/15 - cap_enter(2): stricter checks

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Wed, 11 Nov 2026 01:07:03 UTC
The branch stable/15 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=6a3815352cb4a131d6dd9a9331a455f371d9c23f

commit 6a3815352cb4a131d6dd9a9331a455f371d9c23f
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-10-21 21:57:59 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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);
 }
 
 /*