[PATCH 09/14] MIPS/ptrace: run seccomp after ptrace
From: Kees Cook <hidden>
Date: 2016-06-09 21:03:36
Also in:
linux-arch, linux-arm-kernel, linux-s390, linux-um, linuxppc-dev, lkml
Subsystem:
mips, ptrace support, the rest · Maintainers:
Thomas Bogendoerfer, Oleg Nesterov, Linus Torvalds
Close the hole where ptrace can change a syscall out from under seccomp. Signed-off-by: Kees Cook <redacted> Cc: Ralf Baechle <redacted> Cc: "Maciej W. Rozycki" <redacted> Cc: James Hogan <redacted> Cc: linux-mips@linux-mips.org --- 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