Commit 15cab952 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

ptrace: the killed tracee should not enter the syscall

Another old/known problem.  If the tracee is killed after it reports
syscall_entry, it starts the syscall and debugger can't control this.
This confuses the users and this creates the security problems for
ptrace jailers.

Change tracehook_report_syscall_entry() to return non-zero if killed,
this instructs syscall_trace_enter() to abort the syscall.
Reported-by: default avatarChris Evans <scarybeasts@gmail.com>
Tested-by: default avatarIndan Zupancic <indan@nul.nu>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Pedro Alves <palves@redhat.com>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d533df07
...@@ -54,12 +54,12 @@ struct linux_binprm; ...@@ -54,12 +54,12 @@ struct linux_binprm;
/* /*
* ptrace report for syscall entry and exit looks identical. * ptrace report for syscall entry and exit looks identical.
*/ */
static inline void ptrace_report_syscall(struct pt_regs *regs) static inline int ptrace_report_syscall(struct pt_regs *regs)
{ {
int ptrace = current->ptrace; int ptrace = current->ptrace;
if (!(ptrace & PT_PTRACED)) if (!(ptrace & PT_PTRACED))
return; return 0;
ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0)); ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
...@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs) ...@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
send_sig(current->exit_code, current, 1); send_sig(current->exit_code, current, 1);
current->exit_code = 0; current->exit_code = 0;
} }
return fatal_signal_pending(current);
} }
/** /**
...@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs) ...@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
static inline __must_check int tracehook_report_syscall_entry( static inline __must_check int tracehook_report_syscall_entry(
struct pt_regs *regs) struct pt_regs *regs)
{ {
ptrace_report_syscall(regs); return ptrace_report_syscall(regs);
return 0;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment