]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
syscalls/x86: Fix function types in COND_SYSCALL
authorSami Tolvanen <samitolvanen@google.com>
Tue, 8 Oct 2019 22:40:49 +0000 (15:40 -0700)
committerPaolo Pisati <paolo.pisati@canonical.com>
Thu, 30 Jan 2020 15:24:34 +0000 (16:24 +0100)
commit32cdf2751718d9c5d8061b0d4d32382e754639aa
treecdcd67331baab5280d4e36ae694637d0b0fcc364
parenta570a56544b6ddcd732b4adbc4d517045b0e73f3
syscalls/x86: Fix function types in COND_SYSCALL

BugLink: https://bugs.launchpad.net/bugs/1861085
commit 6e4847640c6aebcaa2d9b3686cecc91b41f09269 upstream.

Define a weak function in COND_SYSCALL instead of a weak alias to
sys_ni_syscall(), which has an incompatible type. This fixes 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-6-samitolvanen@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
arch/x86/include/asm/syscall_wrapper.h