diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_exec.c | 5 | ||||
| -rw-r--r-- | sys/kern/kern_kse.c | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 47b3a33..d236832 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/pioctl.h> #include <sys/namei.h> #include <sys/sf_buf.h> +#include <sys/syscallsubr.h> #include <sys/sysent.h> #include <sys/shm.h> #include <sys/sysctl.h> @@ -78,8 +79,6 @@ MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments"); static int sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS); static int sysctl_kern_usrstack(SYSCTL_HANDLER_ARGS); static int sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS); -static int kern_execve(struct thread *td, char *fname, char **argv, - char **envv, struct mac *mac_p); static int do_execve(struct thread *td, char *fname, char **argv, char **envv, struct mac *mac_p); @@ -207,7 +206,7 @@ __mac_execve(td, uap) #endif } -static int +int kern_execve(td, fname, argv, envv, mac_p) struct thread *td; char *fname; diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c index eff18d1..5a98f82 100644 --- a/sys/kern/kern_kse.c +++ b/sys/kern/kern_kse.c @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/ptrace.h> #include <sys/smp.h> +#include <sys/syscallsubr.h> #include <sys/sysproto.h> #include <sys/sched.h> #include <sys/signalvar.h> @@ -176,11 +177,13 @@ struct kse_thr_interrupt_args { int kse_thr_interrupt(struct thread *td, struct kse_thr_interrupt_args *uap) { + struct kse_execve_args args; struct proc *p; struct thread *td2; struct kse_upcall *ku; struct kse_thr_mailbox *tmbx; uint32_t flags; + int error; p = td->td_proc; @@ -256,6 +259,20 @@ kse_thr_interrupt(struct thread *td, struct kse_thr_interrupt_args *uap) } return (0); + case KSE_INTR_EXECVE: + error = copyin((void *)uap->data, &args, sizeof(args)); + if (error) + return (error); + error = kern_execve(td, args.path, args.argv, args.envp, NULL); + if (error == 0) { + PROC_LOCK(p); + SIGSETOR(td->td_siglist, args.sigpend); + PROC_UNLOCK(p); + kern_sigprocmask(td, SIG_SETMASK, &args.sigmask, NULL, + 0); + } + return (error); + default: return (EINVAL); } |
