mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
fe4bfff86e
The terminator for the mode 1 syscalls list was a 0, but that could be a valid syscall number (e.g. x86_64 __NR_read). By luck, __NR_read was listed first and the loop construct would not test it, so there was no bug. However, this is fragile. Replace the terminator with -1 instead, and make the variable name for mode 1 syscall lists more descriptive. Cc: Andy Lutomirski <luto@amacapital.net> Cc: Will Drewry <wad@chromium.org> Signed-off-by: Kees Cook <keescook@chromium.org>
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* include/asm-generic/seccomp.h
|
|
*
|
|
* Copyright (C) 2014 Linaro Limited
|
|
* Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
|
*/
|
|
#ifndef _ASM_GENERIC_SECCOMP_H
|
|
#define _ASM_GENERIC_SECCOMP_H
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
#if defined(CONFIG_COMPAT) && !defined(__NR_seccomp_read_32)
|
|
#define __NR_seccomp_read_32 __NR_read
|
|
#define __NR_seccomp_write_32 __NR_write
|
|
#define __NR_seccomp_exit_32 __NR_exit
|
|
#ifndef __NR_seccomp_sigreturn_32
|
|
#define __NR_seccomp_sigreturn_32 __NR_rt_sigreturn
|
|
#endif
|
|
#endif /* CONFIG_COMPAT && ! already defined */
|
|
|
|
#define __NR_seccomp_read __NR_read
|
|
#define __NR_seccomp_write __NR_write
|
|
#define __NR_seccomp_exit __NR_exit
|
|
#ifndef __NR_seccomp_sigreturn
|
|
#define __NR_seccomp_sigreturn __NR_rt_sigreturn
|
|
#endif
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
#ifndef get_compat_mode1_syscalls
|
|
static inline const int *get_compat_mode1_syscalls(void)
|
|
{
|
|
static const int mode1_syscalls_32[] = {
|
|
__NR_seccomp_read_32, __NR_seccomp_write_32,
|
|
__NR_seccomp_exit_32, __NR_seccomp_sigreturn_32,
|
|
-1, /* negative terminated */
|
|
};
|
|
return mode1_syscalls_32;
|
|
}
|
|
#endif
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
#endif /* _ASM_GENERIC_SECCOMP_H */
|