diff options
| author | Will Drewry <wad@chromium.org> | 2011-06-27 11:12:28 -0500 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:26:32 -0700 |
| commit | 32d5fe0ff3848bb9a6b7d60a77fe244d1f9cd2af (patch) | |
| tree | 39caa47106a7f41e657e8308f110c5471762bd7a /arch | |
| parent | 91ce8351f39c1433e580e60c2860a312fe94d357 (diff) | |
UBUNTU: SAUCE: seccomp_filter: add HAVE_SECCOMP_FILTER and seccomp_execve
Adds support to the x86 architecture by providing a compatibility
mode wrapper for sys_execve's number and selecting HAVE_SECCOMP_FILTER
v9: rebase on to bccaeafd7c117acee36e90d37c7e05c19be9e7bf
Signed-off-by: Will Drewry <wad@chromium.org>
BUG=chromium-os:14496
TEST=see others ref'd in bug
Change-Id: Id0e8440181e98f7edb12ef702f2f6bdca54d15a6
Reviewed-on: http://gerrit.chromium.org/gerrit/3244
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Will Drewry <wad@chromium.org>
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/ia32_unistd.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/seccomp_64.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0f3c31e9280..08d3b37ee78 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -64,6 +64,7 @@ config X86 select HAVE_TEXT_POKE_SMP select HAVE_GENERIC_HARDIRQS select HAVE_SPARSE_IRQ + select HAVE_SECCOMP_FILTER select GENERIC_FIND_FIRST_BIT select GENERIC_IRQ_PROBE select GENERIC_PENDING_IRQ if SMP diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h index 976f6ecd2ce..8ed2922b835 100644 --- a/arch/x86/include/asm/ia32_unistd.h +++ b/arch/x86/include/asm/ia32_unistd.h @@ -12,6 +12,7 @@ #define __NR_ia32_exit 1 #define __NR_ia32_read 3 #define __NR_ia32_write 4 +#define __NR_ia32_execve 11 #define __NR_ia32_sigreturn 119 #define __NR_ia32_rt_sigreturn 173 diff --git a/arch/x86/include/asm/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h index 84ec1bd161a..85c42197517 100644 --- a/arch/x86/include/asm/seccomp_64.h +++ b/arch/x86/include/asm/seccomp_64.h @@ -8,10 +8,12 @@ #define __NR_seccomp_write __NR_write #define __NR_seccomp_exit __NR_exit #define __NR_seccomp_sigreturn __NR_rt_sigreturn +#define __NR_seccomp_execve __NR_execve #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 +#define __NR_seccomp_execve_32 __NR_ia32_execve #endif /* _ASM_X86_SECCOMP_64_H */ |