3ebcb6145a
commit f48f01a92cca09e86d46c91d8edf9d5a71c61727 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
33 lines
1.2 KiB
C
33 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* System call table for i386. */
|
|
|
|
#include <linux/linkage.h>
|
|
#include <linux/sys.h>
|
|
#include <linux/cache.h>
|
|
#include <asm/asm-offsets.h>
|
|
#include <asm/syscall.h>
|
|
|
|
#ifdef CONFIG_IA32_EMULATION
|
|
/* On X86_64, we use struct pt_regs * to pass parameters to syscalls */
|
|
#define __SYSCALL_I386(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);
|
|
#define __sys_ni_syscall __ia32_sys_ni_syscall
|
|
#else /* CONFIG_IA32_EMULATION */
|
|
#define __SYSCALL_I386(nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
|
|
extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
|
|
#define __sys_ni_syscall sys_ni_syscall
|
|
#endif /* CONFIG_IA32_EMULATION */
|
|
|
|
#include <asm/syscalls_32.h>
|
|
#undef __SYSCALL_I386
|
|
|
|
#define __SYSCALL_I386(nr, sym, qual) [nr] = sym,
|
|
|
|
__visible const sys_call_ptr_t ia32_sys_call_table[__NR_syscall_compat_max+1] = {
|
|
/*
|
|
* Smells like a compiler bug -- it doesn't work
|
|
* when the & below is removed.
|
|
*/
|
|
[0 ... __NR_syscall_compat_max] = &__sys_ni_syscall,
|
|
#include <asm/syscalls_32.h>
|
|
};
|