Message ID | 1416418072-18639-5-git-send-email-drysdale@google.com |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Hi David, On Wed, 19 Nov 2014 17:27:51 +0000 David Drysdale <drysdale@google.com> wrote: > > diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S > index 580cde9370c9..15069cb35dac 100644 > --- a/arch/sparc/kernel/systbls_64.S > +++ b/arch/sparc/kernel/systbls_64.S > @@ -88,6 +88,7 @@ sys_call_table32: > .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev > /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr > .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf > +/*350*/ .word sys_execveat Shouldn't this be compat_sys_execveat? > > #endif /* CONFIG_COMPAT */
On Wed, Nov 19, 2014 at 11:42 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi David, > > On Wed, 19 Nov 2014 17:27:51 +0000 David Drysdale <drysdale@google.com> wrote: >> >> diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S >> index 580cde9370c9..15069cb35dac 100644 >> --- a/arch/sparc/kernel/systbls_64.S >> +++ b/arch/sparc/kernel/systbls_64.S >> @@ -88,6 +88,7 @@ sys_call_table32: >> .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev >> /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr >> .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf >> +/*350*/ .word sys_execveat > > Shouldn't this be compat_sys_execveat? Yeah, that would make sense -- thanks for spotting. Looking at this more closely, I also wonder if we need a pair of wrappers analogous to sys(32|64)_execve -- they include a (pipeline-executed) flushw instruction after the jmpl to [compat_]sys_execve, which I guess might be needed. So I could add something like the following to arch/sparc/kernel/syscalls.S: sys64_execveat: set sys_execveat, %g1 jmpl %g1, %g0 flushw #ifdef CONFIG_COMPAT sys32_execveat: set compat_sys_execveat, %g1 jmpl %g1, %g0 flushw #endif However, I don't speak SPARC and can't run the code -- any thoughts out there from someone who does & can? Or maybe I should stop trying to be helpful with speculative patches, and just leave wiring up the sparc stuff to the experts... >> >> #endif /* CONFIG_COMPAT */ > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Drysdale <drysdale@google.com> Date: Thu, 20 Nov 2014 11:28:22 +0000 > On Wed, Nov 19, 2014 at 11:42 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> Hi David, >> >> On Wed, 19 Nov 2014 17:27:51 +0000 David Drysdale <drysdale@google.com> wrote: >>> >>> diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S >>> index 580cde9370c9..15069cb35dac 100644 >>> --- a/arch/sparc/kernel/systbls_64.S >>> +++ b/arch/sparc/kernel/systbls_64.S >>> @@ -88,6 +88,7 @@ sys_call_table32: >>> .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev >>> /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr >>> .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf >>> +/*350*/ .word sys_execveat >> >> Shouldn't this be compat_sys_execveat? > > Yeah, that would make sense -- thanks for spotting. > > Looking at this more closely, I also wonder if we need a pair of wrappers > analogous to sys(32|64)_execve -- they include a (pipeline-executed) > flushw instruction after the jmpl to [compat_]sys_execve, which I guess > might be needed. So I could add something like the following to > arch/sparc/kernel/syscalls.S: > > sys64_execveat: > set sys_execveat, %g1 > jmpl %g1, %g0 > flushw > #ifdef CONFIG_COMPAT > sys32_execveat: > set compat_sys_execveat, %g1 > jmpl %g1, %g0 > flushw > #endif > > However, I don't speak SPARC and can't run the code -- any thoughts > out there from someone who does & can? > > Or maybe I should stop trying to be helpful with speculative patches, and > just leave wiring up the sparc stuff to the experts... You need wrappers for execve() like system calls yes, in order to flush all of the user register windows to the stack before the kill the address space. I think your code snippet above is fine, except that you should indent the flushw by one space more because it is in the delay slot of a control transfer instruction. Thanks. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index 46d83842eddc..6f35f4df17f2 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h @@ -415,8 +415,9 @@ #define __NR_getrandom 347 #define __NR_memfd_create 348 #define __NR_bpf 349 +#define __NR_execveat 350 -#define NR_syscalls 350 +#define NR_syscalls 351 /* Bitmask values returned from kern_features system call. */ #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S index ad0cdf497b78..e31a9056a303 100644 --- a/arch/sparc/kernel/systbls_32.S +++ b/arch/sparc/kernel/systbls_32.S @@ -87,3 +87,4 @@ sys_call_table: /*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev /*340*/ .long sys_ni_syscall, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr /*345*/ .long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf +/*350*/ .long sys_execveat diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S index 580cde9370c9..15069cb35dac 100644 --- a/arch/sparc/kernel/systbls_64.S +++ b/arch/sparc/kernel/systbls_64.S @@ -88,6 +88,7 @@ sys_call_table32: .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf +/*350*/ .word sys_execveat #endif /* CONFIG_COMPAT */ @@ -167,3 +168,4 @@ sys_call_table: .word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr .word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf +/*350*/ .word sys_execveat