summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2016-05-27 21:57:02 +0200
committerKees Cook <keescook@chromium.org>2016-06-14 19:54:39 +0200
commit2f275de5d1ed7269913ef9b4c64a13952c0a38e8 (patch)
tree0151774ac6f2d8d8e89cc3402fc57ab8918bf610 /kernel
parentseccomp: add tests for ptrace hole (diff)
downloadlinux-2f275de5d1ed7269913ef9b4c64a13952c0a38e8.tar.xz
linux-2f275de5d1ed7269913ef9b4c64a13952c0a38e8.zip
seccomp: Add a seccomp_data parameter secure_computing()
Currently, if arch code wants to supply seccomp_data directly to seccomp (which is generally much faster than having seccomp do it using the syscall_get_xyz() API), it has to use the two-phase seccomp hooks. Add it to the easy hooks, too. Cc: linux-arch@vger.kernel.org Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/seccomp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 7002796f14a4..06816290a212 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -554,9 +554,9 @@ void secure_computing_strict(int this_syscall)
BUG();
}
#else
-int __secure_computing(void)
+int __secure_computing(const struct seccomp_data *sd)
{
- u32 phase1_result = seccomp_phase1(NULL);
+ u32 phase1_result = seccomp_phase1(sd);
if (likely(phase1_result == SECCOMP_PHASE1_OK))
return 0;