1 files changed, 15 insertions, 2 deletions

diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 6788727d91af..70f6acecd928 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -112,7 +112,20 @@ trace_a_syscall:
 
         move    s0, t2                  # Save syscall pointer
         move    a0, sp
-        jal     syscall_trace_enter
+        /*
+         * syscall number is in v0 unless we called syscall(__NR_###)
+         * where the real syscall number is in a0
+         * note: NR_syscall is the first O32 syscall but the macro is
+         * only defined when compiling with -mabi=32 (CONFIG_32BIT)
+         * therefore __NR_O32_Linux is used (4000)
+         */
+        addiu   a1, v0,  __NR_O32_Linux
+        bnez    v0, 1f /* __NR_syscall at offset 0 */
+        lw      a1, PT_R4(sp)
+
+1:      jal     syscall_trace_enter
+
+        bltz    v0, 2f                  # seccomp failed? Skip syscall
 
         move    t0, s0
         RESTORE_STATIC
@@ -136,7 +149,7 @@ trace_a_syscall:
         sd      t1, PT_R0(sp)           # save it for syscall restarting
 1:      sd      v0, PT_R2(sp)           # result
 
-        j       syscall_exit
+2:      j       syscall_exit
 
 /* ------------------------------------------------------------------------ */