mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 04:26:45 +00:00
3ebcb6145a
commit f48f01a92c 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>
56 lines
1.3 KiB
C
56 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* System call table for x86-64. */
|
|
|
|
#include <linux/linkage.h>
|
|
#include <linux/sys.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/syscalls.h>
|
|
#include <asm/asm-offsets.h>
|
|
#include <asm/syscall.h>
|
|
|
|
extern asmlinkage long sys_ni_syscall(void);
|
|
|
|
SYSCALL_DEFINE0(ni_syscall)
|
|
{
|
|
return sys_ni_syscall();
|
|
}
|
|
|
|
#define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);
|
|
#define __SYSCALL_X32(nr, sym, qual) __SYSCALL_64(nr, sym, qual)
|
|
#include <asm/syscalls_64.h>
|
|
#undef __SYSCALL_64
|
|
#undef __SYSCALL_X32
|
|
|
|
#define __SYSCALL_64(nr, sym, qual) [nr] = sym,
|
|
#define __SYSCALL_X32(nr, sym, qual)
|
|
|
|
asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
|
|
/*
|
|
* Smells like a compiler bug -- it doesn't work
|
|
* when the & below is removed.
|
|
*/
|
|
[0 ... __NR_syscall_max] = &__x64_sys_ni_syscall,
|
|
#include <asm/syscalls_64.h>
|
|
};
|
|
|
|
#undef __SYSCALL_64
|
|
#undef __SYSCALL_X32
|
|
|
|
#ifdef CONFIG_X86_X32_ABI
|
|
|
|
#define __SYSCALL_64(nr, sym, qual)
|
|
#define __SYSCALL_X32(nr, sym, qual) [nr] = sym,
|
|
|
|
asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = {
|
|
/*
|
|
* Smells like a compiler bug -- it doesn't work
|
|
* when the & below is removed.
|
|
*/
|
|
[0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall,
|
|
#include <asm/syscalls_64.h>
|
|
};
|
|
|
|
#undef __SYSCALL_64
|
|
#undef __SYSCALL_X32
|
|
|
|
#endif
|