Commit 57a05918 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

exit: reparent: cleanup the changing of ->parent

1. Cosmetic, but "if (t->parent == father)" looks a bit confusing.
   We need to change t->parent if and only if t is not traced.

2. If we actually want this BUG_ON() to ensure that parent/ptrace
   match each other, then we should also take ptrace_reparented()
   case into account too.

3. Change this code to use for_each_thread() instead of deprecated

[ silence a bogus static checker warning]
Signed-off-by: default avatarOleg Nesterov <>
Cc: Aaron Tomlin <>
Cc: Alexey Dobriyan <>
Cc: "Eric W. Biederman" <>,
Cc: Sterling Alexander <>
Cc: Peter Zijlstra <>
Cc: Roland McGrath <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent dc2fd4b0
......@@ -557,7 +557,7 @@ static void reparent_leader(struct task_struct *father, struct task_struct *p,
static void forget_original_parent(struct task_struct *father)
struct task_struct *p, *n, *reaper;
struct task_struct *p, *t, *n, *reaper;
......@@ -569,18 +569,15 @@ static void forget_original_parent(struct task_struct *father)
reaper = find_new_reaper(father);
list_for_each_entry_safe(p, n, &father->children, sibling) {
struct task_struct *t = p;
do {
for_each_thread(p, t) {
t->real_parent = reaper;
if (t->parent == father) {
BUG_ON((!t->ptrace) != (t->parent == father));
if (likely(!t->ptrace))
t->parent = t->real_parent;
if (t->pdeath_signal)
} while_each_thread(p, t);
reparent_leader(father, p, &dead_children);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment