diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2014-12-11 00:54:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 02:41:17 +0100 |
| commit | 8a1296aea4a319b33c3367ff3805835e949a229f (patch) | |
| tree | 81e2f96286e523330c2d698d742899ef3dd1909b | |
| parent | exit: proc: don't try to flush /proc/tgid/task/tgid (diff) | |
| download | linux-8a1296aea4a319b33c3367ff3805835e949a229f.tar.xz linux-8a1296aea4a319b33c3367ff3805835e949a229f.zip | |
exit: reparent: fix the dead-parent PR_SET_CHILD_SUBREAPER reparenting
The ->has_child_subreaper code in find_new_reaper() finds alive "thread"
but returns another "reaper" thread which can be dead.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Aaron Tomlin <atomlin@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Kay Sievers <kay@vrfy.org>
Cc: Lennart Poettering <lennart@poettering.net>
Cc: Sterling Alexander <stalexan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 9a65f10dc9ff..fd38a8f04367 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -512,7 +512,7 @@ static struct task_struct *find_new_reaper(struct task_struct *father) thread = reaper; do { if (!(thread->flags & PF_EXITING)) - return reaper; + return thread; } while_each_thread(reaper, thread); } } |