Close the hole where ptrace can change a syscall out from under seccomp.

Signed-off-by: Kees Cook <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: "Maciej W. Rozycki" <[email protected]>
Cc: James Hogan <[email protected]>
Cc: [email protected]
---
 arch/mips/kernel/ptrace.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index c50af846ecf9..6103b24d1bfc 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -888,17 +888,16 @@ long arch_ptrace(struct task_struct *child, long request,
  */
 asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
 {
-       long ret = 0;
        user_exit();
 
        current_thread_info()->syscall = syscall;
 
-       if (secure_computing(NULL) == -1)
-               return -1;
-
        if (test_thread_flag(TIF_SYSCALL_TRACE) &&
            tracehook_report_syscall_entry(regs))
-               ret = -1;
+               return -1;
+
+       if (secure_computing(NULL) == -1)
+               return -1;
 
        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
                trace_sys_enter(regs, regs->regs[2]);
-- 
2.7.4

Reply via email to