exit: reparent: fix the dead-parent PR_SET_CHILD_SUBREAPER reparenting
authorOleg Nesterov <oleg@redhat.com>
Wed, 10 Dec 2014 23:54:59 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 01:41:17 +0000 (17:41 -0800)
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>
kernel/exit.c

index 9a65f10dc9ff582e9e2232008efbd69427cdabef..fd38a8f0436729eeb7f84108f2e78dfbabaeabb3 100644 (file)
@@ -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);
                }
        }