[RESEND,v1,54/55] pstree: Use CLONE_NEWPID only to create child reaper of pid_ns

Submitted by Kirill Tkhai on March 24, 2017, 3:17 p.m.

Details

Message ID 149036865024.23093.12408064090637163978.stgit@localhost.localdomain
State New
Series "Nested pid namespaces support"
Headers show

Commit Message

Kirill Tkhai March 24, 2017, 3:17 p.m.
If task has no INIT_PID, then clear this clone flag.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 criu/pstree.c |    2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/pstree.c b/criu/pstree.c
index 19e8acdc..09a7ac8c 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -1109,6 +1109,8 @@  static int prepare_pstree_kobj_ids(void)
 		 * move_in_cgroup(), so drop this flag here as well.
 		 */
 		rsti(item)->clone_flags &= ~(CLONE_NEWNET | CLONE_NEWCGROUP);
+		if (last_level_pid(item->pid) != INIT_PID)
+			rsti(item)->clone_flags &= ~CLONE_NEWPID;
 
 		cflags &= CLONE_ALLNS;