coredump-kill-ptrace-related-stuff-fix
PATCH 1/1 coredump-kill-ptrace-related-stuff-fix
This patch fixes 2 bugs in
"[PATCH 3/4] coredump: kill ptrace related stuff" coredump-kill-ptrace-related-stuff.patch
1. Roland McGrath pointed out that SIGNAL_GROUP_EXIT can't prevent the task from going to ptrace_stop() and schedule in TASK_TRACED state.
As Eric W. Biederman suggested, ptrace_stop() should check ->core_waiters.
2. This patch killed 'if (child->ptrace)' check in ptrace_detach() because that check was added to protect against ptrace_detach() vs zap_threads() race.
However, the check is still needed: de_thread() can release the task after ptrace_check_attach() succeeded.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/signal.c renamed from kernel/signal.c~1_FIX +30 -5
@@ -1531,6 +1531,35 @@ static void do_notify_parent_cldstop(strspin_unlock_irqrestore (&sighand->siglock, flags); } +static inline int may_ptrace_stop (void ) +{ +if (!likely (current->ptrace &PT_PTRACED )) +return 0 ; + +if (unlikely (current->parent == current->real_parent && + (current->ptrace &PT_ATTACHED ))) +return 0 ; + +if (unlikely (current->signal == current->parent->signal) && +unlikely (current->signal->flags &SIGNAL_GROUP_EXIT )) +return 0 ; + +/* +* Are we in the middle of do_coredump? +* If so and our tracer is also part of the coredump stopping +* is a deadlock situation, and pointless because our tracer +* is dead so don't allow us to stop. +* If SIGKILL was already sent before the caller unlocked +* ->siglock we must see ->core_waiters != 0. Otherwise it +* is safe to enter schedule(). +*/ +if (unlikely (current->mm->core_waiters) && +unlikely (current->mm == current->parent->mm)) +return 0 ; + +return 1 ; +} +/* * This must be called with current->sighand->siglock held. *
@@ -1559,11 +1588,7 @@ static void ptrace_stop(int exit_code, ispin_unlock_irq (¤t->sighand->siglock);try_to_freeze ();read_lock (&tasklist_lock); -if (likely (current->ptrace &PT_PTRACED ) && -likely (current->parent != current->real_parent || - !(current->ptrace &PT_ATTACHED )) && - (likely (current->parent->signal != current->signal) || - !unlikely (current->signal->flags &SIGNAL_GROUP_EXIT ))) { +if (may_ptrace_stop ()) {do_notify_parent_cldstop (current,CLD_TRAPPED );read_unlock (&tasklist_lock);schedule ();
kernel/ptrace.c renamed from kernel/ptrace.c~1_FIX +3 -1
@@ -213,7 +213,9 @@ int ptrace_detach(struct task_struct *chptrace_disable (child);write_lock_irq (&tasklist_lock); -__ptrace_detach (child, data); +/* protect against de_thread()->release_task() */ +if (child->ptrace) +__ptrace_detach (child, data);write_unlock_irq (&tasklist_lock);return 0 ;