summaryrefslogtreecommitdiff
path: root/arch/x86/entry/vsyscall
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2016-05-27 22:57:02 +0300
committerKees Cook <keescook@chromium.org>2016-06-14 20:54:39 +0300
commit2f275de5d1ed7269913ef9b4c64a13952c0a38e8 (patch)
tree0151774ac6f2d8d8e89cc3402fc57ab8918bf610 /arch/x86/entry/vsyscall
parent58d0a862f573c3354fa912603ef5a4db188774e7 (diff)
downloadlinux-2f275de5d1ed7269913ef9b4c64a13952c0a38e8.tar.xz
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/x86/entry/vsyscall')
-rw-r--r--arch/x86/entry/vsyscall/vsyscall_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c
index 174c2549939d..85acde5fa442 100644
--- a/arch/x86/entry/vsyscall/vsyscall_64.c
+++ b/arch/x86/entry/vsyscall/vsyscall_64.c
@@ -207,7 +207,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
*/
regs->orig_ax = syscall_nr;
regs->ax = -ENOSYS;
- tmp = secure_computing();
+ tmp = secure_computing(NULL);
if ((!tmp && regs->orig_ax != syscall_nr) || regs->ip != address) {
warn_bad_vsyscall(KERN_DEBUG, regs,
"seccomp tried to change syscall nr or ip");