x86&x86-64 support for sys_indirect
PATCH 2/4 x86&x86-64 support for sys_indirect
This part adds support for sys_indirect on x86 and x86-64.
b/arch/x86/ia32/ia32entry.S | 1 + b/arch/x86/kernel/syscall_table_32.S | 1 + b/include/asm-x86/indirect.h | 5 +++++ b/include/asm-x86/indirect_32.h | 27 +++++++++++++++++++++++++++ b/include/asm-x86/indirect_64.h | 30 ++++++++++++++++++++++++++++++ b/include/asm-x86/unistd_32.h | 3 ++- b/include/asm-x86/unistd_64.h | 2 ++ 7 files changed, 68 insertions(+), 1 deletion(-)
arch/x86/ia32/ia32entry.S +1 -0
@@ -726,4 +726,5 @@ ia32_sys_call_table: .quad compat_sys_timerfd .quad sys_eventfd .quad sys32_fallocate + .quad sys_indirect /* 325 */ ia32_syscall_end:
arch/x86/kernel/syscall_table_32.S +1 -0
@@ -324,3 +324,4 @@ ENTRY(sys_call_table) .long sys_timerfd .long sys_eventfd .long sys_fallocate + .long sys_indirect /* 325 */
include/asm-x86/unistd_32.h +2 -1
@@ -330,10 +330,11 @@#define __NR_timerfd 322#define __NR_eventfd 323#define __NR_fallocate 324 +#define __NR_indirect 325#ifdef __KERNEL__ -#define NR_syscalls 325 +#define NR_syscalls 326#define __ARCH_WANT_IPC_PARSE_VERSION#define __ARCH_WANT_OLD_READDIR
include/asm-x86/unistd_64.h +2 -0
@@ -635,6 +635,8 @@ __SYSCALL(__NR_timerfd, sys_timerfd) __SYSCALL(__NR_eventfd, sys_eventfd)#define __NR_fallocate 285 __SYSCALL(__NR_fallocate, sys_fallocate) +#define __NR_indirect 286 +__SYSCALL(__NR_indirect, sys_indirect)#ifndef __NO_STUBS#define __ARCH_WANT_OLD_READDIR
include/asm-x86/indirect_32.h new file +27 -0
@@ -0,0 +1,27 @@ +#ifndef _ASM_X86_INDIRECT_32_H +#define _ASM_X86_INDIRECT_32_H + +struct indirect_registers { +__u32 eax; +__u32 ebx; +__u32 ecx; +__u32 edx; +__u32 esi; +__u32 edi; +__u32 ebp; +}; + +#define CALL_INDIRECT (regs) \ + ({ long res; \ + if (unlikely((regs)->eax > NR_syscalls)) \ + res = -ENOSYS; \ + else if (unlikely((regs)->eax == __NR_indirect)) \ + res = -EINVAL; \ + else { \ + extern long (*sys_call_table[]) (__u32, __u32, __u32, __u32, __u32, __u32); \ + res = sys_call_table[(regs)->eax] ((regs)->ebx, (regs)->ecx, (regs)->edx, \ + (regs)->esi, (regs)->edi, (regs)->ebp); \ + } \ + res; }) + +#endif
include/asm-x86/indirect_64.h new file +30 -0
@@ -0,0 +1,30 @@ +#ifndef _ASM_X86_INDIRECT_64_H +#define _ASM_X86_INDIRECT_64_H + +struct indirect_registers { +__u64 rax; +__u64 rdi; +__u64 rsi; +__u64 rdx; +__u64 r10; +__u64 r8; +__u64 r9; +}; + + +#define CALL_INDIRECT (regs) \ + CALL_INDIRECT_WMAX(regs, __NR_syscall_max) +#define CALL_INDIRECT_WMAX (regs, max) \ + ({ long res; \ + if (unlikely((regs)->rax > max)) \ + res = -ENOSYS; \ + else if (unlikely((regs)->rax == __NR_indirect)) \ + res = -EINVAL; \ + else { \ + extern long (*sys_call_table[]) (__u64, __u64, __u64, __u64, __u64, __u64); \ + res = sys_call_table[(regs)->rax] ((regs)->rdi, (regs)->rsi, (regs)->rdx, \ + (regs)->r10, (regs)->r8, (regs)->r9); \ + } \ + res; }) + +#endif
include/asm-x86/indirect.h new file +5 -0
@@ -0,0 +1,5 @@ +#ifdef CONFIG_X86_32 +# include "indirect_32.h" +#else +# include "indirect_64.h" +#endif
[ Ingo, Thomas - see the whole series on linux-kernel ]
Quoted 2 lines · Ulrich Drepper
This part adds support for
sys_indirecton x86 and x86-64.
The thing is, not all system calls can do this.
Some system calls are magic, and don't just take the arguments in
registers: they also care about the actual stack pointer and the whole pt_regs struct when returning to user mode.
So this does need more infrastructure: some way of marking which system calls cannot be executed indirectly.
The magic system calls are things like:
- sys_iopl() - this one changes the eflags value restored on iret
- execve/clone/vfork() - need direct access to pt_regs
- vm86() - does magic with the stack, cares about pt_regs
- sigreturn - magic pt_regs accesses again
and there may be others I have forgotten about.
Calling these system calls from C code will just corrupt the kernel stack, and is a big big no-no.
Linus