Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jun 2022 19:36:52 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 54689a282aee - stable/13 - linux(4): Modify sv_onexec hook to return an error.
Message-ID:  <202206171936.25HJaqvD012606@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin:

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

commit 54689a282aee8075063228881ee577de181967b6
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2022-06-17 19:33:05 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-17 19:33:05 +0000

    linux(4): Modify sv_onexec hook to return an error.
    
    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
    
    (cherry picked from commit 5fd9cd53d256e08c601548c425bfcb3472f2d09b)
---
 sys/amd64/linux/linux_sysvec.c     | 12 +++++++++++-
 sys/amd64/linux32/linux32_sysvec.c | 12 +++++++++++-
 sys/arm64/linux/linux_sysvec.c     | 12 +++++++++++-
 sys/i386/linux/linux_sysvec.c      | 14 ++++++++++++--
 sys/kern/kern_exec.c               |  4 +---
 sys/sys/sysent.h                   |  2 +-
 6 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c
index 5237e32b614d..bcc8cbf0b0bd 100644
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c
@@ -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
@@ -760,12 +762,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)
 {
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 398ac51d4203..2a3fde78852d 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -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);
@@ -929,12 +931,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)
 {
diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
index 1b815b8ac0f2..44f4ffab5286 100644
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -89,6 +89,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);
@@ -431,12 +433,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)
 {
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 92bf6a7bed24..b1a5fb5ba062 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -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);
@@ -834,7 +836,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,
@@ -877,12 +879,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)
 {
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index e6081cba7a4b..f62c4582e89a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1196,9 +1196,7 @@ exec_new_vmspace(struct image_params *imgp, struct sysentvec *sv)
 		}
 	}
 
-	if (sv->sv_onexec != NULL)
-		sv->sv_onexec(p, imgp);
-	return (0);
+	return (sv->sv_onexec != NULL ? sv->sv_onexec(p, imgp) : 0);
 }
 
 /*
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index f02383bacdbc..7696879112e5 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -153,7 +153,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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171936.25HJaqvD012606>