Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit

[cascardo/linux.git] / arch / s390 / kernel / ptrace.c

diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 49b1c13..9336e82 100644 (file)
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -821,14 +821,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 
 asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
 {
-       long ret = 0;
-
-       /* Do the secure computing check first. */
-       if (secure_computing()) {
-               /* seccomp failures shouldn't expose any additional code. */
-               ret = -1;
-               goto out;
-       }
+       unsigned long mask = -1UL;
 
        /*
         * The sysc_tracesys code in entry.S stored the system
@@ -843,17 +836,26 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
                 * the system call and the system call restart handling.
                 */
                clear_pt_regs_flag(regs, PIF_SYSCALL);
-               ret = -1;
+               return -1;
+       }
+
+       /* Do the secure computing check after ptrace. */
+       if (secure_computing(NULL)) {
+               /* seccomp failures shouldn't expose any additional code. */
+               return -1;
        }
 
        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
                trace_sys_enter(regs, regs->gprs[2]);
 
-       audit_syscall_entry(regs->gprs[2], regs->orig_gpr2,
-                           regs->gprs[3], regs->gprs[4],
-                           regs->gprs[5]);
-out:
-       return ret ?: regs->gprs[2];
+       if (is_compat_task())
+               mask = 0xffffffff;
+
+       audit_syscall_entry(regs->gprs[2], regs->orig_gpr2 & mask,
+                           regs->gprs[3] &mask, regs->gprs[4] &mask,
+                           regs->gprs[5] &mask);
+
+       return regs->gprs[2];
 }
 
 asmlinkage void do_syscall_trace_exit(struct pt_regs *regs)