The branch stable/15 has been updated by kib:

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

commit e9002239571fb1502505ff85061934ef0ebd2e1e
Author:     Konstantin Belousov <[email protected]>
AuthorDate: 2026-06-07 19:21:40 +0000
Commit:     Konstantin Belousov <[email protected]>
CommitDate: 2026-06-26 22:16:10 +0000

    linux_prlimit(): block execve for the target
    
    (cherry picked from commit e41c28e67fac9cd22a85b160c5c9d0477ed03600)
---
 sys/compat/linux/linux_misc.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 8eaa6e7831c3..1a4eba5f9d39 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -2010,6 +2010,7 @@ linux_prlimit64(struct thread *td, struct 
linux_prlimit64_args *args)
        u_int which;
        int flags;
        int error;
+       bool exec_blocked;
 
        if (args->new == NULL && args->old != NULL) {
                if (linux_get_dummy_limit(td, args->resource, &rlim)) {
@@ -2037,6 +2038,7 @@ linux_prlimit64(struct thread *td, struct 
linux_prlimit64_args *args)
                        return (error);
        }
 
+       exec_blocked = false;
        flags = PGET_HOLD | PGET_NOTWEXIT;
        if (args->new != NULL)
                flags |= PGET_CANDEBUG;
@@ -2049,6 +2051,14 @@ linux_prlimit64(struct thread *td, struct 
linux_prlimit64_args *args)
                error = pget(args->pid, flags, &p);
                if (error != 0)
                        return (error);
+               exec_blocked = true;
+               PROC_LOCK(p);
+               execve_block_wait(td, p);
+               error = args->new != NULL ? p_candebug(td, p) :
+                   p_cansee(td, p);
+               PROC_UNLOCK(p);
+               if (error != 0)
+                       goto out;
        }
        if (args->old != NULL) {
                PROC_LOCK(p);
@@ -2071,6 +2081,11 @@ linux_prlimit64(struct thread *td, struct 
linux_prlimit64_args *args)
                error = kern_proc_setrlimit(td, p, which, &nrlim);
 
  out:
+       if (exec_blocked) {
+               PROC_LOCK(p);
+               execve_unblock(td, p);
+               PROC_UNLOCK(p);
+       }
        PRELE(p);
        return (error);
 }

Reply via email to