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

Commit 2d96fcbd authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

ANDROID: x86: use the correct function type in SYSCALL_DEFINE0 



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

Bug: 133186739
Change-Id: I246d27e4418695231979f4f9a6d98c8eb6776167
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 0a90c27b

arch/x86/include/asm/syscall_wrapper.h

+9 −8
Original line number Diff line number Diff line
@@ -48,12 +48,13 @@ 
 * To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias

 * named __ia32_sys_*()

 */



#define SYSCALL_DEFINE0(sname)						\

	SYSCALL_METADATA(_##sname, 0);					\

	asmlinkage long __x64_sys_##sname(void);		\

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

	ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO);		\

	SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname);		\

	asmlinkage long __x64_sys_##sname(void)

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



#define COND_SYSCALL(name)						\

	cond_syscall(__x64_sys_##name);					\
@@ -183,9 +184,9 @@ 
#ifndef SYSCALL_DEFINE0

#define SYSCALL_DEFINE0(sname)					\

	SYSCALL_METADATA(_##sname, 0);				\

	asmlinkage long __x64_sys_##sname(void);		\

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

	ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO);	\

	asmlinkage long __x64_sys_##sname(void)

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

#endif



#ifndef COND_SYSCALL