81cc6d8400
[ Upstream commit acfc35cfcee5df419391671ef1a631f43feee4e3 ]
Add the same change for ARM64 as done in the commit 9440c4294160
("x86/syscall: Include asm/ptrace.h in syscall_wrapper header") to
make sure all syscalls see 'struct pt_regs' definition and resulted
BTF for '__arm64_sys_*(struct pt_regs *regs)' functions point to
actual struct.
Without this patch, the BPF verifier refuses to load a tracing prog
which accesses pt_regs.
bpf(BPF_PROG_LOAD, {prog_type=0x1a, ...}, 128) = -1 EACCES
With this patch, we can see the correct error, which saves us time
in debugging the prog.
bpf(BPF_PROG_LOAD, {prog_type=0x1a, ...}, 128) = 4
bpf(BPF_RAW_TRACEPOINT_OPEN, {raw_tracepoint={name=NULL, prog_fd=4}}, 128) = -1 ENOTSUPP
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20221031215728.50389-1-kuniyu@amazon.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
84 lines
3.0 KiB
C
84 lines
3.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* syscall_wrapper.h - arm64 specific wrappers to syscall definitions
|
|
*
|
|
* Based on arch/x86/include/asm_syscall_wrapper.h
|
|
*/
|
|
|
|
#ifndef __ASM_SYSCALL_WRAPPER_H
|
|
#define __ASM_SYSCALL_WRAPPER_H
|
|
|
|
#include <asm/ptrace.h>
|
|
|
|
#define SC_ARM64_REGS_TO_ARGS(x, ...) \
|
|
__MAP(x,__SC_ARGS \
|
|
,,regs->regs[0],,regs->regs[1],,regs->regs[2] \
|
|
,,regs->regs[3],,regs->regs[4],,regs->regs[5])
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
|
|
asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__arm64_compat_sys##name, ERRNO); \
|
|
static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
|
|
static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
|
|
asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return __se_compat_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__)); \
|
|
} \
|
|
static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
|
|
{ \
|
|
return __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
|
|
} \
|
|
static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
#define COMPAT_SYSCALL_DEFINE0(sname) \
|
|
asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused); \
|
|
ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO); \
|
|
asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)
|
|
|
|
#define COND_SYSCALL_COMPAT(name) \
|
|
asmlinkage long __weak __arm64_compat_sys_##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return sys_ni_syscall(); \
|
|
}
|
|
|
|
#define COMPAT_SYS_NI(name) \
|
|
SYSCALL_ALIAS(__arm64_compat_sys_##name, sys_ni_posix_timers);
|
|
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
#define __SYSCALL_DEFINEx(x, name, ...) \
|
|
asmlinkage long __arm64_sys##name(const struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__arm64_sys##name, ERRNO); \
|
|
static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
|
|
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
|
|
asmlinkage long __arm64_sys##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return __se_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__)); \
|
|
} \
|
|
static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
|
|
{ \
|
|
long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__)); \
|
|
__MAP(x,__SC_TEST,__VA_ARGS__); \
|
|
__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \
|
|
return ret; \
|
|
} \
|
|
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
#define SYSCALL_DEFINE0(sname) \
|
|
SYSCALL_METADATA(_##sname, 0); \
|
|
asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \
|
|
ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \
|
|
asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused)
|
|
|
|
#define COND_SYSCALL(name) \
|
|
asmlinkage long __weak __arm64_sys_##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return sys_ni_syscall(); \
|
|
}
|
|
|
|
#define SYS_NI(name) SYSCALL_ALIAS(__arm64_sys_##name, sys_ni_posix_timers);
|
|
|
|
#endif /* __ASM_SYSCALL_WRAPPER_H */
|