Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-17 07:51:57 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-17 07:51:57 -0700
commita61b6024bf3994699216d212a2c48e123dca5db1 (patch)
tree3f49f7c3fa79179edeb2901f63c24fd86c12f500
parent6bf1545b847e64e7f048fda19c24297c95a00cf6 (diff)
Clean up ptrace child exit case.
This also fixes it for when the real parent is ignoring SIGCHLD - noted by David Mosberger.
-rw-r--r--kernel/exit.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 5d13c054d256..2b2f728220e4 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1018,20 +1018,17 @@ static int wait_task_zombie(task_t *p, unsigned int __user *stat_addr, struct ru
if (p->real_parent != p->parent) {
__ptrace_unlink(p);
p->state = TASK_ZOMBIE;
- /* If this is a detached thread, this is where it goes away. */
- if (p->exit_signal == -1) {
- /* release_task takes the lock itself. */
- write_unlock_irq(&tasklist_lock);
- release_task (p);
- }
- else {
+ /*
+ * If this is not a detached task, notify the parent. If it's
+ * still not detached after that, don't release it now.
+ */
+ if (p->exit_signal != -1) {
do_notify_parent(p, p->exit_signal);
- write_unlock_irq(&tasklist_lock);
+ if (p->exit_signal != -1)
+ p = NULL;
}
- p = NULL;
}
- else
- write_unlock_irq(&tasklist_lock);
+ write_unlock_irq(&tasklist_lock);
}
if (p != NULL)
release_task(p);