Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-17 16:47:50 +00:00
Code Issues Projects Releases Wiki Activity

restore: Fix memory leaks in CoreEntry handling

Browse source 
In open_cores(), we were not freeing already opened core entries if one
of them failed to open. Also, the cores array was not zero-initialized,
which could lead to freeing garbage pointers in the error path. Use
xzalloc() to ensure the array is zeroed.

In sigreturn_restore(), thread core entries were not being freed after
use, leading to a memory leak. Add a loop to free them.

Signed-off-by: Andrei Vagin <avagin@google.com>
This commit is contained in:
Andrei Vagin 2026-03-14 06:54:08 +00:00 • committed by Radostin Stoyanov
parent 128566551d
commit b0ebc416a6
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
criu/cr-restore.c
View file

@ -516,12 +516,12 @@ static int open_core(int pid, CoreEntry **pcore)
static int open_cores(int pid, CoreEntry *leader_core)
{
int i, tpid;
int i, j, tpid;
CoreEntry **cores = NULL;
cores = xmalloc(sizeof(*cores) * current->nr_threads);
cores = xzalloc(sizeof(*cores) * current->nr_threads);
if (!cores)
goto err;
return -1;
for (i = 0; i < current->nr_threads; i++) {
tpid = current->threads[i].ns[0].virt;
@ -570,6 +570,10 @@ static int open_cores(int pid, CoreEntry *leader_core)
return 0;
err:
for (j = 0; j < i; j++) {
if (cores[j] && cores[j] != leader_core)
core_entry__free_unpacked(cores[j], NULL);
}
xfree(cores);
return -1;
}
@ -3521,6 +3525,10 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
/* No longer need it */
core_entry__free_unpacked(core, NULL);
for (i = 0; i < current->nr_threads; i++) {
if (current->core[i] && current->core[i] != core)
core_entry__free_unpacked(current->core[i], NULL);
}
xfree(current->core);
/*