Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98fd62e0 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Greg Kroah-Hartman
Browse files

arm64: use the correct function type in SYSCALL_DEFINE0 



[ Upstream commit 0e358bd7b7ebd27e491dabed938eae254c17fe3b ]

Although a syscall defined using SYSCALL_DEFINE0 doesn't accept
parameters, use the correct function type to avoid indirect call
type mismatches with Control-Flow Integrity checking.

Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c5fdfaed

arch/arm64/include/asm/syscall_wrapper.h

+9 −9
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
	static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))



#define COMPAT_SYSCALL_DEFINE0(sname)							\

	asmlinkage long __arm64_compat_sys_##sname(void);		\

	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(void)

	asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)



#define COND_SYSCALL_COMPAT(name) \

	cond_syscall(__arm64_compat_sys_##name);
@@ -64,9 +64,9 @@ 
#ifndef SYSCALL_DEFINE0

#define SYSCALL_DEFINE0(sname)							\

	SYSCALL_METADATA(_##sname, 0);						\

	asmlinkage long __arm64_sys_##sname(void);		\

	asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused);	\

	ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO);			\

	asmlinkage long __arm64_sys_##sname(void)

	asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused)

#endif



#ifndef COND_SYSCALL