summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2016-06-03 04:56:43 +0200
committerKees Cook <keescook@chromium.org>2016-06-14 19:54:46 +0200
commit635efc702984857b45a2a2491ed7a529e14cbdf9 (patch)
treea85e780e94d69da8bbd2c9a914d14a61353092af /arch
parentpowerpc/ptrace: run seccomp after ptrace (diff)
downloadlinux-635efc702984857b45a2a2491ed7a529e14cbdf9.tar.xz
linux-635efc702984857b45a2a2491ed7a529e14cbdf9.zip
tile/ptrace: run seccomp after ptrace
Close the hole where ptrace can change a syscall out from under seccomp. Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Chris Metcalf <cmetcalf@mellanox.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/tile/kernel/ptrace.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index 8c6d2f2fefa3..d89b7011667c 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -255,14 +255,15 @@ int do_syscall_trace_enter(struct pt_regs *regs)
{
u32 work = ACCESS_ONCE(current_thread_info()->flags);
- if (secure_computing(NULL) == -1)
+ if ((work & _TIF_SYSCALL_TRACE) &&
+ tracehook_report_syscall_entry(regs)) {
+ regs->regs[TREG_SYSCALL_NR] = -1;
return -1;
-
- if (work & _TIF_SYSCALL_TRACE) {
- if (tracehook_report_syscall_entry(regs))
- regs->regs[TREG_SYSCALL_NR] = -1;
}
+ if (secure_computing(NULL) == -1)
+ return -1;
+
if (work & _TIF_SYSCALL_TRACEPOINT)
trace_sys_enter(regs, regs->regs[TREG_SYSCALL_NR]);