Skip to content

Commit 8aac627

Browse files
oleg-nesterovAl Viro
authored and
Al Viro
committed
move exit_task_namespaces() outside of exit_notify()
exit_notify() does exit_task_namespaces() after forget_original_parent(). This was needed to ensure that ->nsproxy can't be cleared prematurely, an exiting child we are going to reparent can do do_notify_parent() and use the parent's (ours) pid_ns. However, after 3208450 "pidns: use task_active_pid_ns in do_notify_parent" ->nsproxy != NULL is no longer needed, we rely on task_active_pid_ns(). Move exit_task_namespaces() from exit_notify() to do_exit(), after exit_fs() and before exit_task_work(). This solves the problem reported by Andrey, free_ipc_ns()->shm_destroy() does fput() which needs task_work_add(). Note: this particular problem can be fixed if we change fput(), and that change makes sense anyway. But there is another reason to move the callsite. The original reason for exit_task_namespaces() from the middle of exit_notify() was subtle and it has already gone away, now this looks confusing. And this allows us do simplify exit_notify(), we can avoid unlock/lock(tasklist) and we can use ->exit_state instead of PF_EXITING in forget_original_parent(). Reported-by: Andrey Vagin <avagin@openvz.org> Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Andrey Vagin <avagin@openvz.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent e7b2c40 commit 8aac627

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/exit.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
649649
* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2)
650650
*/
651651
forget_original_parent(tsk);
652-
exit_task_namespaces(tsk);
653652

654653
write_lock_irq(&tasklist_lock);
655654
if (group_dead)
@@ -795,6 +794,7 @@ void do_exit(long code)
795794
exit_shm(tsk);
796795
exit_files(tsk);
797796
exit_fs(tsk);
797+
exit_task_namespaces(tsk);
798798
exit_task_work(tsk);
799799
check_stack_usage();
800800
exit_thread();

0 commit comments

Comments
 (0)