From f8781c4a226319fe60e652118b90cf094ccfe747 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Thu, 5 Apr 2018 11:53:05 +0200 Subject: 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 Acked-by: Linus Torvalds Cc: Al Viro Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20180405095307.3730-7-linux@dominikbrodowski.net Signed-off-by: Ingo Molnar --- arch/x86/entry/vsyscall/vsyscall_64.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'arch/x86/entry/vsyscall') 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; } -- cgit v1.2.3