summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/ptrace.c
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 /arch/s390/kernel/ptrace.c
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 'arch/s390/kernel/ptrace.c')
-rw-r--r--arch/s390/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 49b1c13bf6c9..c238e9958c2a 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -824,7 +824,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
long ret = 0;
/* Do the secure computing check first. */
- if (secure_computing()) {
+ if (secure_computing(NULL)) {
/* seccomp failures shouldn't expose any additional code. */
ret = -1;
goto out;