summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2019-05-24 15:11:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-22 08:15:20 +0200
commitc5fdfaedecc2382b1cb1bcfae790798d9ad14b85 (patch)
treea8f445fc0e82d7486b684384432c900335e96ba6
parentdf6384e0f42ea8921a37b0e752502d01f59a93b2 (diff)
downloadlinux-stable-c5fdfaedecc2382b1cb1bcfae790798d9ad14b85.tar.gz
linux-stable-c5fdfaedecc2382b1cb1bcfae790798d9ad14b85.tar.bz2
linux-stable-c5fdfaedecc2382b1cb1bcfae790798d9ad14b85.zip
arm64: fix syscall_fn_t type
[ Upstream commit 8ef8f368ce72b5e17f7c1f1ef15c38dcfd0fef64 ] Syscall wrappers in <asm/syscall_wrapper.h> use const struct pt_regs * as the argument type. Use const in syscall_fn_t as well to fix indirect call type mismatches with Control-Flow Integrity checking. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/arm64/include/asm/syscall.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index ad8be16a39c9..58102652bf9e 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -20,7 +20,7 @@
#include <linux/compat.h>
#include <linux/err.h>
-typedef long (*syscall_fn_t)(struct pt_regs *regs);
+typedef long (*syscall_fn_t)(const struct pt_regs *regs);
extern const syscall_fn_t sys_call_table[];