diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-04-05 11:53:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-04-05 16:59:38 +0200 |
| commit | f8781c4a226319fe60e652118b90cf094ccfe747 (patch) | |
| tree | 1c496211debfc33f955021c62898da4c08f052cd /arch/x86/entry/vsyscall | |
| parent | ebeb8c82ffaf94435806ff0b686fffd41dd410b5 (diff) | |
syscalls/x86: Unconditionally enable 'struct pt_regs' based syscalls on x86_64
Removing CONFIG_SYSCALL_PTREGS from arch/x86/Kconfig and simply selecting
ARCH_HAS_SYSCALL_WRAPPER unconditionally on x86-64 allows us to simplify
several codepaths.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180405095307.3730-7-linux@dominikbrodowski.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/vsyscall')
| -rw-r--r-- | arch/x86/entry/vsyscall/vsyscall_64.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 05eebbf9b989..20b3d4a88ee4 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -127,9 +127,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) int vsyscall_nr, syscall_nr, tmp; int prev_sig_on_uaccess_err; long ret; -#ifdef CONFIG_SYSCALL_PTREGS unsigned long orig_dx; -#endif /* * No point in checking CS -- the only way to get here is a user mode @@ -230,38 +228,22 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) ret = -EFAULT; switch (vsyscall_nr) { case 0: -#ifdef CONFIG_SYSCALL_PTREGS /* this decodes regs->di and regs->si on its own */ ret = sys_gettimeofday(regs); -#else - ret = sys_gettimeofday( - (struct timeval __user *)regs->di, - (struct timezone __user *)regs->si); -#endif /* CONFIG_SYSCALL_PTREGS */ break; case 1: -#ifdef CONFIG_SYSCALL_PTREGS /* this decodes regs->di on its own */ ret = sys_time(regs); -#else - ret = sys_time((time_t __user *)regs->di); -#endif /* CONFIG_SYSCALL_PTREGS */ break; case 2: -#ifdef CONFIG_SYSCALL_PTREGS /* while we could clobber regs->dx, we didn't in the past... */ orig_dx = regs->dx; regs->dx = 0; /* this decodes regs->di, regs->si and regs->dx on its own */ ret = sys_getcpu(regs); regs->dx = orig_dx; -#else - ret = sys_getcpu((unsigned __user *)regs->di, - (unsigned __user *)regs->si, - NULL); -#endif /* CONFIG_SYSCALL_PTREGS */ break; } |