linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
	Andy Lutomirski <luto@amacapital.net>,
	Oleg Nesterov <oleg@redhat.com>, Will Drewry <wad@chromium.org>,
	Julien Tinnes <jln@chromium.org>,
	David Drysdale <drysdale@google.com>,
	Alexei Starovoitov <ast@plumgrid.com>,
	John Johansen <john.johansen@canonical.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	x86@kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-mips@linux-mips.org, linux-api@vger.kernel.org,
	linux-arch@vger.kernel.org,
	linux-security-module@vger.kernel.org
Subject: [PATCH v6 1/9] seccomp: create internal mode-setting function
Date: Tue, 10 Jun 2014 20:25:13 -0700	[thread overview]
Message-ID: <1402457121-8410-2-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1402457121-8410-1-git-send-email-keescook@chromium.org>

In preparation for having other callers of the seccomp mode setting
logic, split the prctl entry point away from the core logic that performs
seccomp mode setting.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 kernel/seccomp.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index f6d76bebe69f..552b972b8f83 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -465,7 +465,7 @@ long prctl_get_seccomp(void)
 }
 
 /**
- * prctl_set_seccomp: configures current->seccomp.mode
+ * seccomp_set_mode: internal function for setting seccomp mode
  * @seccomp_mode: requested mode to use
  * @filter: optional struct sock_fprog for use with SECCOMP_MODE_FILTER
  *
@@ -478,7 +478,7 @@ long prctl_get_seccomp(void)
  *
  * Returns 0 on success or -EINVAL on failure.
  */
-long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter)
+static long seccomp_set_mode(unsigned long seccomp_mode, char __user *filter)
 {
 	long ret = -EINVAL;
 
@@ -509,3 +509,15 @@ long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter)
 out:
 	return ret;
 }
+
+/**
+ * prctl_set_seccomp: configures current->seccomp.mode
+ * @seccomp_mode: requested mode to use
+ * @filter: optional struct sock_fprog for use with SECCOMP_MODE_FILTER
+ *
+ * Returns 0 on success or -EINVAL on failure.
+ */
+long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter)
+{
+	return seccomp_set_mode(seccomp_mode, filter);
+}
-- 
1.7.9.5

  parent reply	other threads:[~2014-06-11  3:26 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-11  3:25 [PATCH v6 0/9] seccomp: add thread sync ability Kees Cook
2014-06-11  3:25 ` Kees Cook
2014-06-11  3:25 ` Kees Cook [this message]
2014-06-11  3:25 ` [PATCH v6 2/9] seccomp: split filter prep from check and apply Kees Cook
2014-06-11  3:25   ` Kees Cook
2014-06-11  3:25 ` [PATCH v6 3/9] seccomp: introduce writer locking Kees Cook
2014-06-11  3:25 ` [PATCH v6 4/9] seccomp: move no_new_privs into seccomp Kees Cook
2014-06-11  3:25   ` Kees Cook
2014-06-11  3:25 ` [PATCH v6 5/9] seccomp: split mode set routines Kees Cook
2014-06-11  3:25   ` Kees Cook
2014-06-11  3:25 ` [PATCH v6 6/9] seccomp: add "seccomp" syscall Kees Cook
2014-06-11  3:25   ` Kees Cook
     [not found]   ` <1402457121-8410-7-git-send-email-keescook-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2014-06-13 20:41     ` Andy Lutomirski
2014-06-13 20:41       ` Andy Lutomirski
2014-06-13 21:22   ` Alexei Starovoitov
2014-06-13 21:22     ` Alexei Starovoitov
     [not found]     ` <CAMEtUuwKRUYN_qdnCj42G3Z1UT3vMYPoJqXd2_PjV+_J3WA+8w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-06-13 21:25       ` Andy Lutomirski
2014-06-13 21:25         ` Andy Lutomirski
     [not found]         ` <CALCETrVCJvnj9yr5yhhZTn_Gq32mgSqOhMRi16Y=_LvqGOTZ5g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-06-13 21:37           ` Alexei Starovoitov
2014-06-13 21:37             ` Alexei Starovoitov
2014-06-13 21:42             ` Andy Lutomirski
2014-06-13 22:01               ` Kees Cook
2014-06-13 22:01                 ` Kees Cook
2014-06-13 22:26               ` Alexei Starovoitov
2014-06-13 21:53       ` Kees Cook
2014-06-13 21:53         ` Kees Cook
2014-06-16  6:08   ` Michael Kerrisk (man-pages)
2014-06-11  3:25 ` [PATCH v6 7/9] seccomp: implement SECCOMP_FILTER_FLAG_TSYNC Kees Cook
2014-06-11  3:25   ` Kees Cook
2014-06-11  3:25 ` [PATCH v6 8/9] ARM: add seccomp syscall Kees Cook
2014-06-11  3:25   ` Kees Cook
2014-06-11  3:25 ` [PATCH v6 9/9] MIPS: " Kees Cook
2014-06-11  3:25   ` Kees Cook
  -- strict thread matches above, loose matches on Subject: below --
2014-06-10 23:01 [PATCH v6 0/9] seccomp: add thread sync ability Kees Cook
2014-06-10 23:01 ` [PATCH v6 1/9] seccomp: create internal mode-setting function Kees Cook

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=1402457121-8410-2-git-send-email-keescook@chromium.org \
    --to=keescook@chromium.org \
    --cc=akpm@linux-foundation.org \
    --cc=ast@plumgrid.com \
    --cc=drysdale@google.com \
    --cc=jln@chromium.org \
    --cc=john.johansen@canonical.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=oleg@redhat.com \
    --cc=wad@chromium.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;
as well as URLs for NNTP newsgroup(s).