mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

pid_ns: Move parent pid_ns's helper check to create_pid_ns_helper()

Browse Source 
It's impossible to create a task from a pid_ns if its helper
is not created, because we wait in wait_pid_ns_helper_prepared()
for that. So, such situation here is a bug.
Move the wait and convert it to BUG().

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2017-05-16 19:26:47 +03:00
committed by Andrei Vagin
parent 56719a3e52
commit e31ad5f195
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
criu/namespaces.c
View File

@@ -2645,12 +2645,6 @@ static int do_create_pid_ns_helper(void *arg, int sk, pid_t unused_pid)
goto err; goto err;
} }
tmp = ns->parent;
if (tmp) {
futex_t *f = &tmp->pid.helper_created;
futex_wait_while_eq(f, 0);
}
if (switch_ns(root_item->pid->real, &mnt_ns_desc, &mnt_ns_fd) < 0) { if (switch_ns(root_item->pid->real, &mnt_ns_desc, &mnt_ns_fd) < 0) {
pr_err("Can't set mnt_ns\n"); pr_err("Can't set mnt_ns\n");
goto err; goto err;
@@ -2730,6 +2724,7 @@ int create_pid_ns_helper(struct ns_id *ns)
int sk; int sk;
BUG_ON(getpid() != INIT_PID); BUG_ON(getpid() != INIT_PID);
BUG_ON(ns->parent && !futex_get(&ns->parent->pid.helper_created));
if (__set_next_pid(ns->ns_pid) < 0) { if (__set_next_pid(ns->ns_pid) < 0) {
pr_err("Can't set next fd\n"); pr_err("Can't set next fd\n");