d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux(4): Modify sv_onexec hook to return an error.

Browse Source 
Temporary add stubs to the Linux emulation layer which calls the existing hook.

Reviewed by:		kib
Differential Revision:	https://reviews.freebsd.org/D30911
MFC after:		2 weeks
This commit is contained in:
Dmitry Chagin 2021-07-20 09:56:25 +03:00
parent 62ba4cd340
commit 5fd9cd53d2
6 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/amd64/linux/linux_sysvec.c
View File

@ -106,6 +106,8 @@ static void linux_set_syscall_retval(struct thread *td, int error);
static int linux_fetch_syscall_args(struct thread *td);
static void linux_exec_setregs(struct thread *td, struct image_params *imgp,
uintptr_t stack);
static int linux_on_exec_vmspace(struct proc *p,
struct image_params *imgp);
static int linux_vsyscall(struct thread *td);
#define LINUX_T_UNKNOWN 255
@ -766,12 +768,20 @@ struct sysentvec elf_linux_sysvec = {
.sv_schedtail = linux_schedtail,
.sv_thread_detach = linux_thread_detach,
.sv_trap = linux_vsyscall,
.sv_onexec = linux_on_exec,
.sv_onexec = linux_on_exec_vmspace,
.sv_onexit = linux_on_exit,
.sv_ontdexit = linux_thread_dtor,
.sv_setid_allowed = &linux_setid_allowed_query,
};
static int
linux_on_exec_vmspace(struct proc *p, struct image_params *imgp)
{
linux_on_exec(p, imgp);
return (0);
}
static void
linux_vdso_install(void *param)
{

12
sys/amd64/linux32/linux32_sysvec.c
View File

@ -111,6 +111,8 @@ static int linux_copyout_strings(struct image_params *imgp,
static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask);
static void linux_exec_setregs(struct thread *td,
struct image_params *imgp, uintptr_t stack);
static int linux_on_exec_vmspace(struct proc *p,
struct image_params *imgp);
static void linux32_fixlimit(struct rlimit *rl, int which);
static bool linux32_trans_osrel(const Elf_Note *note, int32_t *osrel);
static void linux_vdso_install(void *param);
@ -938,12 +940,20 @@ struct sysentvec elf_linux_sysvec = {
.sv_schedtail = linux_schedtail,
.sv_thread_detach = linux_thread_detach,
.sv_trap = NULL,
.sv_onexec = linux_on_exec,
.sv_onexec = linux_on_exec_vmspace,
.sv_onexit = linux_on_exit,
.sv_ontdexit = linux_thread_dtor,
.sv_setid_allowed = &linux_setid_allowed_query,
};
static int
linux_on_exec_vmspace(struct proc *p, struct image_params *imgp)
{
linux_on_exec(p, imgp);
return (0);
}
static void
linux_vdso_install(void *param)
{

12
sys/arm64/linux/linux_sysvec.c
View File

@ -86,6 +86,8 @@ static void linux_set_syscall_retval(struct thread *td, int error);
static int linux_fetch_syscall_args(struct thread *td);
static void linux_exec_setregs(struct thread *td, struct image_params *imgp,
uintptr_t stack);
static int linux_on_exec_vmspace(struct proc *p,
struct image_params *imgp);
/* DTrace init */
LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
@ -433,12 +435,20 @@ struct sysentvec elf_linux_sysvec = {
.sv_trap = NULL,
.sv_hwcap = &elf_hwcap,
.sv_hwcap2 = &elf_hwcap2,
.sv_onexec = linux_on_exec,
.sv_onexec = linux_on_exec_vmspace,
.sv_onexit = linux_on_exit,
.sv_ontdexit = linux_thread_dtor,
.sv_setid_allowed = &linux_setid_allowed_query,
};
static int
linux_on_exec_vmspace(struct proc *p, struct image_params *imgp)
{
linux_on_exec(p, imgp);
return (0);
}
static void
linux_vdso_install(const void *param)
{

14
sys/i386/linux/linux_sysvec.c
View File

@ -94,6 +94,8 @@ static int linux_fixup_elf(uintptr_t *stack_base,
static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask);
static void linux_exec_setregs(struct thread *td,
struct image_params *imgp, uintptr_t stack);
static int linux_on_exec_vmspace(struct proc *p,
struct image_params *imgp);
static int linux_copyout_strings(struct image_params *imgp,
uintptr_t *stack_base);
static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel);
@ -838,7 +840,7 @@ struct sysentvec linux_sysvec = {
.sv_schedtail = linux_schedtail,
.sv_thread_detach = linux_thread_detach,
.sv_trap = NULL,
.sv_onexec = linux_on_exec,
.sv_onexec = linux_on_exec_vmspace,
.sv_onexit = linux_on_exit,
.sv_ontdexit = linux_thread_dtor,
.sv_setid_allowed = &linux_setid_allowed_query,
@ -880,12 +882,20 @@ struct sysentvec elf_linux_sysvec = {
.sv_schedtail = linux_schedtail,
.sv_thread_detach = linux_thread_detach,
.sv_trap = NULL,
.sv_onexec = linux_on_exec,
.sv_onexec = linux_on_exec_vmspace,
.sv_onexit = linux_on_exit,
.sv_ontdexit = linux_thread_dtor,
.sv_setid_allowed = &linux_setid_allowed_query,
};
static int
linux_on_exec_vmspace(struct proc *p, struct image_params *imgp)
{
linux_on_exec(p, imgp);
return (0);
}
static void
linux_vdso_install(void *param)
{

4
sys/kern/kern_exec.c
View File

@ -1163,9 +1163,7 @@ exec_new_vmspace(struct image_params *imgp, struct sysentvec *sv)
vmspace->vm_ssize = sgrowsiz >> PAGE_SHIFT;
vmspace->vm_maxsaddr = (char *)stack_addr;
if (sv->sv_onexec != NULL)
sv->sv_onexec(p, imgp);
return (0);
return (sv->sv_onexec != NULL ? sv->sv_onexec(p, imgp) : 0);
}
/*

2
sys/sys/sysent.h
View File

@ -151,7 +151,7 @@ struct sysentvec {
const char *(*sv_machine_arch)(struct proc *);
vm_offset_t sv_fxrng_gen_base;
void (*sv_onexec_old)(struct thread *td);
void (*sv_onexec)(struct proc *, struct image_params *);
int (*sv_onexec)(struct proc *, struct image_params *);
void (*sv_onexit)(struct proc *);
void (*sv_ontdexit)(struct thread *td);
int (*sv_setid_allowed)(struct thread *td,