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

Commit 8eb68bf7 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

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: default avatarKees 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d0f138b0

arch/x86/include/asm/seccomp.h

+18 −3
Original line number Diff line number Diff line 
#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 */

arch/x86/include/asm/seccomp_32.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#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 */

arch/x86/include/asm/seccomp_64.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#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 */