diff options
| author | Kees Cook <keescook@chromium.org> | 2016-06-02 19:56:43 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-06-14 10:54:46 -0700 |
| commit | 635efc702984857b45a2a2491ed7a529e14cbdf9 (patch) | |
| tree | a85e780e94d69da8bbd2c9a914d14a61353092af /arch/tile | |
| parent | 1addc57e111b920f94edb867094ccaa7c1e820b8 (diff) | |
| download | op-kernel-dev-635efc702984857b45a2a2491ed7a529e14cbdf9.zip op-kernel-dev-635efc702984857b45a2a2491ed7a529e14cbdf9.tar.gz | |
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/tile')
| -rw-r--r-- | arch/tile/kernel/ptrace.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c index 8c6d2f2..d89b701 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]); |
