mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Will Drewry <wad@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: kees.cook@canonical.com, torvalds@linux-foundation.org,
	tglx@linutronix.de, mingo@elte.hu, rostedt@goodmis.org,
	jmorris@namei.org, Will Drewry <wad@chromium.org>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	x86@kernel.org
Subject: [PATCH v3 06/13] x86: add HAVE_SECCOMP_FILTER and seccomp_execve
Date: Tue, 31 May 2011 22:10:38 -0500	[thread overview]
Message-ID: <1306897845-9393-6-git-send-email-wad@chromium.org> (raw)
In-Reply-To: <BANLkTimNcag-ZmVTXjUoTyiuJm6jtW0DgA@mail.gmail.com>

Adds support to the x86 architecture by providing a compatibility
mode wrapper for sys_execve's number and selecting HAVE_SECCOMP_FILTER

Signed-off-by: Will Drewry <wad@chromium.org>
---
 arch/x86/Kconfig                   |    1 +
 arch/x86/include/asm/ia32_unistd.h |    1 +
 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 cc6c53a..1843d17 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_FIND_NEXT_BIT
 	select GENERIC_IRQ_PROBE
diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h
index 976f6ec..8ed2922 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 84ec1bd..85c4219 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 */
-- 
1.7.0.4


  parent reply	other threads:[~2011-06-01  3:10 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1305563026.5456.19.camel@gandalf.stny.rr.com>
     [not found] ` <20110516165249.GB10929@elte.hu>
     [not found]   ` <1305565422.5456.21.camel@gandalf.stny.rr.com>
     [not found]     ` <20110517124212.GB21441@elte.hu>
     [not found]       ` <1305637528.5456.723.camel@gandalf.stny.rr.com>
     [not found]         ` <20110517131902.GF21441@elte.hu>
     [not found]           ` <BANLkTikBK3-KZ10eErQ6Eex_L6Qe2aZang@mail.gmail.com>
     [not found]             ` <1305807728.11267.25.camel@gandalf.stny.rr.com>
     [not found]               ` <BANLkTiki8aQJbFkKOFC+s6xAEiuVyMM5MQ@mail.gmail.com>
     [not found]                 ` <BANLkTim9UyYAGhg06vCFLxkYPX18cPymEQ@mail.gmail.com>
     [not found]                   ` <20110524200815.GD27634@elte.hu>
2011-05-24 20:25                     ` [PATCH 3/5] v2 seccomp_filters: Enable ftrace-based system call filtering Kees Cook
2011-05-25 19:09                       ` Ingo Molnar
2011-05-25 16:40                     ` Will Drewry
     [not found]                   ` <1306254027.18455.47.camel@twins>
     [not found]                     ` <20110524195435.GC27634@elte.hu>
     [not found]                       ` <alpine.LFD.2.02.1105242239230.3078@ionos>
     [not found]                         ` <20110525150153.GE29179@elte.hu>
     [not found]                           ` <alpine.LFD.2.02.1105251836030.3078@ionos>
2011-05-25 18:01                             ` Kees Cook
2011-05-25 18:42                               ` Linus Torvalds
2011-05-25 19:06                                 ` Ingo Molnar
2011-05-25 19:54                                   ` Will Drewry
2011-05-25 19:11                                 ` Kees Cook
2011-05-25 20:01                                   ` Linus Torvalds
2011-05-25 20:19                                     ` Ingo Molnar
2011-06-09  9:00                                       ` Sven Anders
2011-05-26 14:37                                     ` Colin Walters
2011-05-26 15:03                                       ` Linus Torvalds
2011-05-26 15:28                                         ` Colin Walters
2011-05-26 16:33                                         ` Will Drewry
2011-05-26 16:46                                           ` Linus Torvalds
2011-05-26 17:02                                             ` Will Drewry
2011-05-26 17:04                                               ` Will Drewry
2011-05-26 17:17                                               ` Linus Torvalds
2011-05-26 17:38                                                 ` Will Drewry
2011-05-26 18:33                                                   ` Linus Torvalds
2011-05-26 18:47                                                     ` Ingo Molnar
2011-05-26 19:05                                                       ` david
2011-05-26 19:09                                                         ` Eric Paris
2011-05-26 19:46                                                         ` Ingo Molnar
2011-05-26 19:49                                                           ` david
2011-05-26 18:49                                                     ` Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 01/13] tracing: split out filter initialization and clean up Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 02/13] tracing: split out syscall_trace_enter construction Will Drewry
2011-06-01  7:00                                                         ` Ingo Molnar
2011-06-01 17:15                                                           ` Will Drewry
2011-06-02 14:29                                                             ` Ingo Molnar
2011-06-02 15:18                                                               ` Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 03/13] seccomp_filters: new mode with configurable syscall filters Will Drewry
2011-06-02 17:36                                                         ` Paul E. McKenney
2011-06-02 18:14                                                           ` Will Drewry
2011-06-02 19:42                                                             ` Paul E. McKenney
2011-06-02 20:28                                                               ` Will Drewry
2011-06-02 20:46                                                                 ` Steven Rostedt
2011-06-02 21:12                                                                   ` Paul E. McKenney
2011-06-01  3:10                                                       ` [PATCH v3 04/13] seccomp_filter: add process state reporting Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 05/13] seccomp_filter: Document what seccomp_filter is and how it works Will Drewry
2011-06-01 21:23                                                         ` Kees Cook
2011-06-01 23:03                                                           ` Will Drewry
2011-06-01  3:10                                                       ` Will Drewry [this message]
2011-06-01  3:10                                                       ` [PATCH v3 07/13] arm: select HAVE_SECCOMP_FILTER Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 08/13] microblaze: select HAVE_SECCOMP_FILTER and provide seccomp_execve Will Drewry
2011-06-01  5:37                                                         ` Michal Simek
2011-06-01  3:10                                                       ` [PATCH v3 09/13] mips: " Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 10/13] s390: " Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 11/13] powerpc: " Will Drewry
2011-06-01  3:10                                                       ` [PATCH v3 12/13] sparc: " Will Drewry
2011-06-01  3:35                                                         ` David Miller
2011-06-01  3:10                                                       ` [PATCH v3 13/13] sh: select HAVE_SECCOMP_FILTER Will Drewry
2011-06-02  5:27                                                         ` Paul Mundt
2011-05-26 17:38                                               ` [PATCH 3/5] v2 seccomp_filters: Enable ftrace-based system call filtering Valdis.Kletnieks
2011-05-26 18:08                                                 ` Will Drewry
2011-05-26 18:22                                                   ` Valdis.Kletnieks
2011-05-26 17:07                                             ` Steven Rostedt
2011-05-26 18:43                                               ` Casey Schaufler
2011-05-26 18:54                                                 ` Steven Rostedt
2011-05-26 18:34                                             ` david
2011-05-26 18:54                                             ` Ingo Molnar
2011-05-26  1:19                                 ` James Morris
2011-05-26  6:08                                   ` Avi Kivity
2011-05-26  8:24                                   ` Ingo Molnar
2011-05-26  8:35                                     ` Pekka Enberg
2011-05-26  8:49                                     ` Avi Kivity
2011-05-26  8:57                                       ` Pekka Enberg
     [not found]                                         ` <20110526085939.GG29458@redhat.com>
2011-05-26 10:38                                           ` Ingo Molnar
2011-05-26 10:46                                             ` Avi Kivity
2011-05-26 10:46                                             ` Gleb Natapov
2011-05-26 11:11                                               ` Ingo Molnar
2011-05-26  9:30                                       ` Ingo Molnar
2011-05-26  9:48                                         ` Ingo Molnar
2011-05-26 11:02                                           ` Avi Kivity
2011-05-26 11:16                                             ` Ingo Molnar
2011-05-26 10:56                                         ` Avi Kivity
2011-05-26 11:38                                           ` Ingo Molnar
2011-05-26 18:06                                             ` Avi Kivity
2011-05-26 18:15                                               ` Ingo Molnar
2011-05-26 18:20                                                 ` Avi Kivity
2011-05-26 18:36                                                   ` Ingo Molnar
2011-05-26 18:43                                                     ` Valdis.Kletnieks
2011-05-26 18:50                                                       ` Ingo Molnar
2011-05-26 18:22                                                 ` Peter Zijlstra
2011-05-26 18:38                                                   ` Ingo Molnar
2011-05-27  0:12                                                     ` James Morris
2011-05-29 16:51                                 ` Aneesh Kumar K.V
2011-05-29 17:02                                   ` Linus Torvalds
2011-05-29 18:23                                     ` Al Viro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1306897845-9393-6-git-send-email-wad@chromium.org \
    --to=wad@chromium.org \
    --cc=hpa@zytor.com \
    --cc=jmorris@namei.org \
    --cc=kees.cook@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®