ARM: add seccomp syscall

Wires up the new seccomp syscall.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Conflicts:
	arch/arm/include/uapi/asm/unistd.h
	arch/arm/kernel/calls.S

Change-Id: Ia519993681f70bd38699a73d8897ae9b44b3f0af

diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
index af33b44990ed4a395662f0c5e7021049e5755a78..bbe80a7cba0c730ce3cb9ba211a28a2aa5fef306 100644 (file)
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -406,6 +406,12 @@
 #define __NR_process_vm_writev         (__NR_SYSCALL_BASE+377)
 #define __NR_kcmp                      (__NR_SYSCALL_BASE+378)
 #define __NR_finit_module              (__NR_SYSCALL_BASE+379)
+/* Backporting seccomp, skip a few ...
+ * #define __NR_sched_setattr          (__NR_SYSCALL_BASE+380)
+ * #define __NR_sched_getattr          (__NR_SYSCALL_BASE+381)
+ * #define __NR_renameat2                      (__NR_SYSCALL_BASE+382)
+ */
+#define __NR_seccomp                   (__NR_SYSCALL_BASE+383)
 
 /*
  * This may need to be greater than __NR_last_syscall+1 in order to

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index c6ca7e376773fcc73ef619e1c5a97793d97b41b4..1a2e529a1340e90ef5eb840c68080797d9bff246 100644 (file)
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -389,6 +389,10 @@
                CALL(sys_process_vm_writev)
                CALL(sys_kcmp)
                CALL(sys_finit_module)
+/* 380 */      CALL(sys_ni_syscall) /* CALL(sys_sched_setattr) */
+               CALL(sys_ni_syscall) /* CALL(sys_sched_getattr) */
+               CALL(sys_ni_syscall) /* CALL(sys_renameat2) */
+               CALL(sys_seccomp)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted