redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

x86: switch to using asm-generic for seccomp.h 

Switch to using the newly created asm-generic/seccomp.h for the seccomp
strict mode syscall definitions. The obsolete sigreturn syscall override
is retained in 32-bit mode, and the ia32 syscall overrides are used in
the compat case. Remaining definitions were identical.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
hifive-unleashed-5.1
Kees Cook 2015-04-16 12:49:04 -07:00 committed by Linus Torvalds
parent d0f138b085
commit 8eb68bf75e
3 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/x86/include/asm/seccomp.h
View File

@ -1,5 +1,20 @@
#ifndef _ASM_X86_SECCOMP_H
#define _ASM_X86_SECCOMP_H
#include <asm/unistd.h>
#ifdef CONFIG_X86_32
# include <asm/seccomp_32.h>
#else
# include <asm/seccomp_64.h>
#define __NR_seccomp_sigreturn __NR_sigreturn
#endif
#ifdef CONFIG_COMPAT
#include <asm/ia32_unistd.h>
#define __NR_seccomp_read_32 __NR_ia32_read
#define __NR_seccomp_write_32 __NR_ia32_write
#define __NR_seccomp_exit_32 __NR_ia32_exit
#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
#endif
#include <asm-generic/seccomp.h>
#endif /* _ASM_X86_SECCOMP_H */

11
arch/x86/include/asm/seccomp_32.h
View File

@ -1,11 +0,0 @@
#ifndef _ASM_X86_SECCOMP_32_H
#define _ASM_X86_SECCOMP_32_H
#include <linux/unistd.h>
#define __NR_seccomp_read __NR_read
#define __NR_seccomp_write __NR_write
#define __NR_seccomp_exit __NR_exit
#define __NR_seccomp_sigreturn __NR_sigreturn
#endif /* _ASM_X86_SECCOMP_32_H */

17
arch/x86/include/asm/seccomp_64.h
View File

@ -1,17 +0,0 @@
#ifndef _ASM_X86_SECCOMP_64_H
#define _ASM_X86_SECCOMP_64_H
#include <linux/unistd.h>
#include <asm/ia32_unistd.h>
#define __NR_seccomp_read __NR_read
#define __NR_seccomp_write __NR_write
#define __NR_seccomp_exit __NR_exit
#define __NR_seccomp_sigreturn __NR_rt_sigreturn
#define __NR_seccomp_read_32 __NR_ia32_read
#define __NR_seccomp_write_32 __NR_ia32_write
#define __NR_seccomp_exit_32 __NR_ia32_exit
#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
#endif /* _ASM_X86_SECCOMP_64_H */