[CRIU] [PATCH 01/10] pstree: fix my_pgid is on last level but vpid is on level 0

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Tue Jul 4 12:08:00 MSK 2017


Comparing ids in different pid namespaces is bug, though these
will be removed by following patches, still fix it to be on the
safe side.

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index f9d9b06..3ce27fd 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1588,7 +1588,7 @@ static void restore_pgid(void)
 
 		leader = rsti(current)->pgrp_leader;
 		if (leader) {
-			BUG_ON(my_pgid != vpid(leader));
+			BUG_ON(vpgid(current) != vpid(leader));
 			futex_wait_until(&rsti(leader)->pgrp_set, 1);
 		}
 	}
-- 
2.9.4



More information about the CRIU mailing list