[v2,55/57] pid: Check for equality of getpid() of child to last_level_pid

Submitted by Kirill Tkhai on March 28, 2017, 3:42 p.m.

Details

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

Commit Message

Kirill Tkhai March 28, 2017, 3:42 p.m.
Make the sanity check working in case of mutli-level pids.

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

Patch hide | download patch | download mbox

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 0ca19ec6..8e93a8b3 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1430,8 +1430,9 @@  static int restore_task_with_children(void *_arg)
 	}
 
 	pid = getpid();
-	if (vpid(current) != pid) {
-		pr_err("Pid %d do not match expected %d\n", pid, vpid(current));
+	if (last_level_pid(current->pid) != pid) {
+		pr_err("Pid %d do not match expected %d (task %d)\n",
+			pid, last_level_pid(current->pid), vpid(current));
 		set_task_cr_err(EEXIST);
 		goto err;
 	}