aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/x86/entry/syscalls/syscall_32.tbl
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2019-10-08 15:40:48 -0700
committerIngo Molnar <mingo@kernel.org>2019-10-11 12:49:18 +0200
commitf48f01a92cca09e86d46c91d8edf9d5a71c61727 (patch)
treee99a03922f7c3f3dc611834b62a6787efeb4b54e /arch/x86/entry/syscalls/syscall_32.tbl
parentsyscalls/x86: Use COMPAT_SYSCALL_DEFINE0 for IA32 (rt_)sigreturn (diff)
downloadwireguard-linux-f48f01a92cca09e86d46c91d8edf9d5a71c61727.tar.xz
wireguard-linux-f48f01a92cca09e86d46c91d8edf9d5a71c61727.zip
syscalls/x86: Use the correct function type for sys_ni_syscall
Use the correct function type for sys_ni_syscall() in system call tables to fix indirect call mismatches with Control-Flow Integrity (CFI) checking. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: H . Peter Anvin <hpa@zytor.com> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20191008224049.115427-5-samitolvanen@google.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/syscalls/syscall_32.tbl')
-rw-r--r--arch/x86/entry/syscalls/syscall_32.tbl4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 2de75fda1d20..15908eb9b17e 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -124,7 +124,7 @@
110 i386 iopl sys_iopl __ia32_sys_iopl
111 i386 vhangup sys_vhangup __ia32_sys_vhangup
112 i386 idle
-113 i386 vm86old sys_vm86old sys_ni_syscall
+113 i386 vm86old sys_vm86old __ia32_sys_ni_syscall
114 i386 wait4 sys_wait4 __ia32_compat_sys_wait4
115 i386 swapoff sys_swapoff __ia32_sys_swapoff
116 i386 sysinfo sys_sysinfo __ia32_compat_sys_sysinfo
@@ -177,7 +177,7 @@
163 i386 mremap sys_mremap __ia32_sys_mremap
164 i386 setresuid sys_setresuid16 __ia32_sys_setresuid16
165 i386 getresuid sys_getresuid16 __ia32_sys_getresuid16
-166 i386 vm86 sys_vm86 sys_ni_syscall
+166 i386 vm86 sys_vm86 __ia32_sys_ni_syscall
167 i386 query_module
168 i386 poll sys_poll __ia32_sys_poll
169 i386 nfsservctl