[SPARC64]: Add SECCOMP support.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 11 insertions, 14 deletions

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index b51bd14cde44..acc323eef535 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -1552,7 +1552,7 @@ sys_ptrace:	add		%sp, PTREGS_OFF, %o0
                 nop
                 .align          32
 1:              ldx             [%curptr + TI_FLAGS], %l5
-                andcc           %l5, _TIF_SYSCALL_TRACE, %g0
+                andcc           %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %g0
                 be,pt           %icc, rtrap
                  clr            %l6
                 call            syscall_trace
@@ -1676,7 +1676,7 @@ linux_sparc_syscall32:
 
         srl             %i5, 0, %o5                             ! IEU1
         srl             %i2, 0, %o2                             ! IEU0  Group
-        andcc           %l0, _TIF_SYSCALL_TRACE, %g0            ! IEU0  Group
+        andcc           %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %g0 ! IEU0      Group
         bne,pn          %icc, linux_syscall_trace32             ! CTI
          mov            %i0, %l5                                ! IEU1
         call            %l7                                     ! CTI   Group brk forced
@@ -1699,7 +1699,7 @@ linux_sparc_syscall:
 
         mov             %i3, %o3                                ! IEU1
         mov             %i4, %o4                                ! IEU0  Group
-        andcc           %l0, _TIF_SYSCALL_TRACE, %g0            ! IEU1  Group+1 bubble
+        andcc           %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %g0 ! IEU1      Group+1 bubble
         bne,pn          %icc, linux_syscall_trace               ! CTI   Group
          mov            %i0, %l5                                ! IEU0
 2:      call            %l7                                     ! CTI   Group brk forced
@@ -1727,7 +1727,7 @@ ret_sys_call:
 1:
         cmp             %o0, -ERESTART_RESTARTBLOCK
         bgeu,pn         %xcc, 1f
-         andcc          %l0, _TIF_SYSCALL_TRACE, %l6    
+         andcc          %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %l6
 80:
         /* System call success, clear Carry condition code. */
         andn            %g3, %g2, %g3
@@ -1742,7 +1742,7 @@ ret_sys_call:
         /* System call failure, set Carry condition code.
          * Also, get abs(errno) to return to the process.
          */
-        andcc           %l0, _TIF_SYSCALL_TRACE, %l6    
+        andcc           %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %l6     
         sub             %g0, %o0, %o0
         or              %g3, %g2, %g3
         stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 52f14e399b1c..533104c7907d 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -4,6 +4,8 @@
  * Copyright (C) 1999 David S. Miller (davem@redhat.com)
  */
 
+#define __KERNEL_SYSCALLS__
+
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -17,7 +19,6 @@
 #include <asm/ebus.h>
 #include <asm/auxio.h>
 
-#define __KERNEL_SYSCALLS__
 #include <linux/unistd.h>
 
 /*
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 80a76e2ad732..5abf596f5964 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -630,9 +630,9 @@ out:
 
 asmlinkage void syscall_trace(void)
 {
-#ifdef DEBUG_PTRACE
-        printk("%s [%d]: syscall_trace\n", current->comm, current->pid);
-#endif
+        /* do the secure computing check first */
+        secure_computing(current_thread_info()->kregs->u_regs[UREG_G1]);
+
         if (!test_thread_flag(TIF_SYSCALL_TRACE))
                 return;
         if (!(current->ptrace & PT_PTRACED))
@@ -645,12 +645,8 @@ asmlinkage void syscall_trace(void)
          * for normal use.  strace only continues with a signal if the
          * stopping signal is not SIGTRAP.  -brl
          */
-#ifdef DEBUG_PTRACE
-        printk("%s [%d]: syscall_trace exit= %x\n", current->comm,
-                current->pid, current->exit_code);
-#endif
         if (current->exit_code) {
-                send_sig (current->exit_code, current, 1);
+                send_sig(current->exit_code, current, 1);
                 current->exit_code = 0;
         }
 }