git: adb14791b752 - stable/14 - kern_event: block the target process from execing for sysctl kern.proc.kqueue
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Jun 2026 00:30:10 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=adb14791b752cf0f07dce44d840f01340aa6d6cb
commit adb14791b752cf0f07dce44d840f01340aa6d6cb
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-06-16 03:48:29 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-06-28 00:29:00 +0000
kern_event: block the target process from execing for sysctl kern.proc.kqueue
(cherry picked from commit 79b384bd8fdff4869ce4799edb0342ff5c25b6fa)
---
sys/kern/kern_event.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 7c31a2f551ab..aaffbfce432c 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -49,6 +49,7 @@
#include <sys/filedesc.h>
#include <sys/filio.h>
#include <sys/fcntl.h>
+#include <sys/imgact.h>
#include <sys/kthread.h>
#include <sys/selinfo.h>
#include <sys/queue.h>
@@ -3070,10 +3071,6 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS)
if ((u_int)arg2 > 2 || (u_int)arg2 == 0)
return (EINVAL);
- error = pget((pid_t)name[0], PGET_HOLD | PGET_CANDEBUG, &p);
- if (error != 0)
- return (error);
-
td = curthread;
#ifdef COMPAT_FREEBSD32
compat32 = SV_CURPROC_FLAG(SV_ILP32);
@@ -3081,6 +3078,17 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS)
compat32 = false;
#endif
+ error = pget((pid_t)name[0], PGET_NOTWEXIT, &p);
+ if (error != 0)
+ return (error);
+
+ _PHOLD(p);
+ execve_block_wait(td, p);
+ error = p_candebug(td, p);
+ if (error != 0)
+ goto out1;
+ PROC_UNLOCK(p);
+
s = sbuf_new_for_sysctl(&sm, NULL, 0, req);
if (s == NULL) {
error = ENOMEM;
@@ -3101,7 +3109,11 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS)
sbuf_delete(s);
out:
- PRELE(p);
+ PROC_LOCK(p);
+out1:
+ execve_unblock(td, p);
+ _PRELE(p);
+ PROC_UNLOCK(p);
return (error);
}