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

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

FROMLIST: arm64: use the correct function type for __arm64_sys_ni_syscall 

Calling sys_ni_syscall through a syscall_fn_t pointer trips indirect
call Control-Flow Integrity checking due to a function type
mismatch. Use SYSCALL_DEFINE0 for __arm64_sys_ni_syscall instead and
remove the now unnecessary casts.

Bug: 133186739
Change-Id: Id01f505b333b864477335e87e0c3100fa60be1eb
Link: https://lkml.org/lkml/2019/5/3/690


Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent d09a3e0d

arch/arm64/kernel/sys.c

+9 −5
Original line number Diff line number Diff line
@@ -47,22 +47,26 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) 
	return ksys_personality(personality);

}



asmlinkage long sys_ni_syscall(void);



SYSCALL_DEFINE0(ni_syscall)

{

	return sys_ni_syscall();

}



/*

 * Wrappers to pass the pt_regs argument.

 */

#define sys_personality		sys_arm64_personality



asmlinkage long sys_ni_syscall(const struct pt_regs *);

#define __arm64_sys_ni_syscall	sys_ni_syscall



#undef __SYSCALL

#define __SYSCALL(nr, sym)	asmlinkage long __arm64_##sym(const struct pt_regs *);

#include <asm/unistd.h>



#undef __SYSCALL

#define __SYSCALL(nr, sym)	[nr] = (syscall_fn_t)__arm64_##sym,

#define __SYSCALL(nr, sym)	[nr] = __arm64_##sym,



const syscall_fn_t sys_call_table[__NR_syscalls] = {

	[0 ... __NR_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,

	[0 ... __NR_syscalls - 1] = __arm64_sys_ni_syscall,

#include <asm/unistd.h>

};

arch/arm64/kernel/sys32.c

+8 −4
Original line number Diff line number Diff line
@@ -133,17 +133,21 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode, 
	return ksys_fallocate(fd, mode, arg_u64(offset), arg_u64(len));

}



asmlinkage long sys_ni_syscall(const struct pt_regs *);

#define __arm64_sys_ni_syscall	sys_ni_syscall

asmlinkage long sys_ni_syscall(void);



COMPAT_SYSCALL_DEFINE0(ni_syscall)

{

	return sys_ni_syscall();

}



#undef __SYSCALL

#define __SYSCALL(nr, sym)	asmlinkage long __arm64_##sym(const struct pt_regs *);

#include <asm/unistd32.h>



#undef __SYSCALL

#define __SYSCALL(nr, sym)	[nr] = (syscall_fn_t)__arm64_##sym,

#define __SYSCALL(nr, sym)	[nr] = __arm64_##sym,



const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] = {

	[0 ... __NR_compat_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,

	[0 ... __NR_compat_syscalls - 1] = __arm64_sys_ni_syscall,

#include <asm/unistd32.h>

};