GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-19 21:21:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64: fix function types in COND_SYSCALL

Browse source 
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.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Sami Tolvanen 2019-09-10 15:40:44 -07:00 • committed by Will Deacon
parent bd3841cd3b
commit c27eccfe4d
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
arch/arm64/include/asm/syscall_wrapper.h
View file

@ -8,6 +8,8 @@
#ifndef __ASM_SYSCALL_WRAPPER_H #ifndef __ASM_SYSCALL_WRAPPER_H
#define __ASM_SYSCALL_WRAPPER_H #define __ASM_SYSCALL_WRAPPER_H
struct pt_regs;
#define SC_ARM64_REGS_TO_ARGS(x, ...) \ #define SC_ARM64_REGS_TO_ARGS(x, ...) \
__MAP(x,__SC_ARGS \ __MAP(x,__SC_ARGS \
,,regs->regs[0],,regs->regs[1],,regs->regs[2] \ ,,regs->regs[0],,regs->regs[1],,regs->regs[2] \
@ -36,7 +38,10 @@
asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused) asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)
#define COND_SYSCALL_COMPAT(name) \ #define COND_SYSCALL_COMPAT(name) \
cond_syscall(__arm64_compat_sys_##name); asmlinkage long __weak __arm64_compat_sys_##name(const struct pt_regs *regs) \
{ \
return sys_ni_syscall(); \
}
#define COMPAT_SYS_NI(name) \ #define COMPAT_SYS_NI(name) \
SYSCALL_ALIAS(__arm64_compat_sys_##name, sys_ni_posix_timers); SYSCALL_ALIAS(__arm64_compat_sys_##name, sys_ni_posix_timers);
@ -70,7 +75,11 @@
#endif #endif
#ifndef COND_SYSCALL #ifndef COND_SYSCALL
#define COND_SYSCALL(name) cond_syscall(__arm64_sys_##name) #define COND_SYSCALL(name) \
asmlinkage long __weak __arm64_sys_##name(const struct pt_regs *regs) \
{ \
return sys_ni_syscall(); \
}
#endif #endif
#ifndef SYS_NI #ifndef SYS_NI