diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
| commit | 4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch) | |
| tree | 50312d13362dd49615148661ae7e6d91ac349719 /kernel/exit.c | |
| parent | 9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 2833ffb0c211..0b81b26a872a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -619,8 +619,8 @@ static void forget_original_parent(struct task_struct *father, reaper = find_new_reaper(father, reaper); list_for_each_entry(p, &father->children, sibling) { for_each_thread(p, t) { - t->real_parent = reaper; - BUG_ON((!t->ptrace) != (t->parent == father)); + RCU_INIT_POINTER(t->real_parent, reaper); + BUG_ON((!t->ptrace) != (rcu_access_pointer(t->parent) == father)); if (likely(!t->ptrace)) t->parent = t->real_parent; if (t->pdeath_signal) |