mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-28 21:07:43 +00:00
Code Issues Releases Wiki Activity

seize: fix error handling for check_freezer_cgroup

Browse Source 
When `check_freezer_cgroup()` has non-zero return value, `goto err` calls
`return ret`. However, the value of `ret` has been set to `0` in the lines
above and CRIU does not handle the error properly.

This problem is related to https://github.com/checkpoint-restore/criu/issues/2508

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov 2024-11-04 19:30:26 +00:00 committed by Andrei Vagin
parent dcc3b49619
commit 216d804aab
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
criu/seize.c
View File

@ -1009,7 +1009,7 @@ static int cgroup_version(void)
int collect_pstree(void) int collect_pstree(void)
{ {
pid_t pid = root_item->pid->real; pid_t pid = root_item->pid->real;
int ret = -1; int ret, exit_code = -1;
struct proc_status_creds creds; struct proc_status_creds creds;
struct pstree_item *iter; struct pstree_item *iter;
@ -1069,7 +1069,6 @@ int collect_pstree(void)
if (opts.freeze_cgroup && !freeze_cgroup_disabled && if (opts.freeze_cgroup && !freeze_cgroup_disabled &&
freezer_wait_processes()) { freezer_wait_processes()) {
ret = -1;
goto err; goto err;
} }
@ -1081,12 +1080,12 @@ int collect_pstree(void)
goto err; goto err;
} }
ret = 0; exit_code = 0;
timing_stop(TIME_FREEZING); timing_stop(TIME_FREEZING);
timing_start(TIME_FROZEN); timing_start(TIME_FROZEN);
err: err:
/* Freezing stage finished in time - disable timer. */ /* Freezing stage finished in time - disable timer. */
alarm(0); alarm(0);
return ret; return exit_code;
} }