Date: Fri, 26 Jun 2026 22:20:53 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 24d8b3364405 - stable/15 - kern_proc.c: disallow execve around sysctl kern.proc.rlimit Message-ID: <6a3efb45.2577b.37d97f2b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24d8b3364405e5c32618c6930d4fdd8bc543a08f commit 24d8b3364405e5c32618c6930d4fdd8bc543a08f Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2026-06-16 04:30:10 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2026-06-26 22:16:07 +0000 kern_proc.c: disallow execve around sysctl kern.proc.rlimit (cherry picked from commit 5a91fa5a7656c99e527fe7e6f6bf6bd9e85ab589) --- sys/kern/kern_proc.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index e2a71466a273..8cf828c7360d 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2994,8 +2994,9 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) u_int namelen = arg2; struct rlimit rlim; struct proc *p; + struct thread *td; u_int which; - int flags, error; + int error; if (namelen != 2) return (EINVAL); @@ -3007,23 +3008,24 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL && req->newlen != sizeof(rlim)) return (EINVAL); - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) - flags |= PGET_CANDEBUG; - else - flags |= PGET_CANSEE; - error = pget((pid_t)name[0], flags, &p); + td = curthread; + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); if (error != 0) return (error); + _PHOLD(p); + execve_block_wait(td, p); + error = req->newptr != NULL ? p_candebug(td, p) : p_cansee(td, p); + if (error != 0) + goto errout1; /* * Retrieve limit. */ if (req->oldptr != NULL) { - PROC_LOCK(p); lim_rlimit_proc(p, which, &rlim); - PROC_UNLOCK(p); } + PROC_UNLOCK(p); + error = SYSCTL_OUT(req, &rlim, sizeof(rlim)); if (error != 0) goto errout; @@ -3038,7 +3040,11 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) } errout: - PRELE(p); + PROC_LOCK(p); +errout1: + _PRELE(p); + execve_unblock(td, p); + PROC_UNLOCK(p); return (error); }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3efb45.2577b.37d97f2b>