Skip to content

restore: move cgroup restore after creds are prepared #2903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avagin merged 1 commit into from
Feb 26, 2026
+5 −3
Merged

restore: move cgroup restore after creds are prepared #2903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions criu/cr-restore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1572,7 +1572,12 @@ static int __restore_task_with_children(void *_arg)
/* Wait prepare_userns */
if (restore_finish_ns_stage(CR_STATE_ROOT_TASK, CR_STATE_PREPARE_NAMESPACES) < 0)
goto err;
}

if (needs_prep_creds(current) && (prepare_userns_creds()))
goto err;

if (current->parent == NULL) {
/*
* Since we don't support nesting of cgroup namespaces, let's
* only set up the cgns (if it exists) in the init task.
Expand All @@ -1581,9 +1586,6 @@ static int __restore_task_with_children(void *_arg)
goto err;
}

if (needs_prep_creds(current) && (prepare_userns_creds()))
goto err;

/*
* Call this _before_ forking to optimize cgroups
* restore -- if all tasks live in one set of cgroups
Expand Down
Loading