Attachment 150106 Details for Bug 232236 – fix patch

[patch] fix patch

ptrace-natural-clone.patch (text/plain), 2.08 KB, created by Roland McGrath on 2007-03-15 00:56:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland McGrath

Created: 2007-03-15 00:56:12 UTC

Size: 2.08 KB

patch

obsolete

>commit 2a0eadd3320f24ffd5c37bcc4e14033177804d56
>Author: Roland McGrath <roland@redhat.com>
>Date:   Wed Mar 14 17:40:27 2007 -0700
>
>    Fix ptrace wait for clone threads of natural child.
>    Also fix ptrace wait status value for non-instigating threads in group exit.
>
>diff --git a/kernel/ptrace.c b/kernel/ptrace.c
>index 809a4fb..b25681c 100644  
>--- a/kernel/ptrace.c
>+++ b/kernel/ptrace.c
>@@ -1137,11 +1137,19 @@ found:
> 	BUG_ON(state->parent != tsk);
> 	rcu_read_unlock();
> 
>-	pr_debug("%d ptrace_do_wait (%d) found %d code %x (%lu)\n",
>-		 current->pid, tsk->pid, p->pid, exit_code, p->exit_state);
>+	pr_debug("%d ptrace_do_wait (%d) found %d code %x (%lu/%d)\n",
>+		 current->pid, tsk->pid, p->pid, exit_code,
>+		 p->exit_state, p->exit_signal);
>+
>+	/*
>+	 * If there was a group exit in progress, all threads report that
>+	 * status.  Most will have SIGKILL in their own exit_code.
>+	 */
>+	if (p->signal->flags & SIGNAL_GROUP_EXIT)
>+		exit_code = p->signal->group_exit_code;
> 
> 	if (p->exit_state) {
>-		if (unlikely(p->parent == tsk))
>+		if (unlikely(p->parent == tsk && p->exit_signal != -1))
> 			/*
> 			 * This is our natural child we were ptracing.
> 			 * When it dies it detaches (see ptrace_report_death).
>@@ -1326,16 +1334,17 @@ ptrace_report_death(struct utrace_attach
> 		 */
> 		tsk->exit_code = SIGKILL;
> 
>-	if (tsk->parent == state->parent) {
>+	if (tsk->parent == state->parent && tsk->exit_signal != -1) {
> 		/*
>-		 * This is a natural child, so we detach and let the normal
>+		 * This is a natural child (excluding clone siblings of a
>+		 * child group_leader), so we detach and let the normal
> 		 * reporting happen once our NOREAP action is gone.  But
> 		 * first, generate a SIGCHLD for those cases where normal
> 		 * behavior won't.  A ptrace'd child always generates SIGCHLD.
> 		 */
> 		pr_debug("ptrace %d death natural parent %d exit_code %x\n",
> 			 tsk->pid, state->parent->pid, tsk->exit_code);
>-		if (tsk->exit_signal == -1 || !thread_group_empty(tsk))
>+		if (!thread_group_empty(tsk))
> 			do_notify(tsk, state->parent, CLD_EXITED);
> 		ptrace_state_unlink(state);
> 		rcu_assign_pointer(engine->data, 0UL);

Actions: View | Diff

Attachments on bug 232236: 150042 | 150103 | 150106