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

mount: free all parts of mnt entries

Browse Source 
mnt_entry contains a few strings and they should be release too

CID 996198 (#4 of 4): Resource leak (RESOURCE_LEAK)
20. leaked_storage: Variable "pm" going out of scope leaks the storage
it points to.

CID 996190 (#1 of 1): Resource leak (RESOURCE_LEAK)
13. leaked_storage: Variable "new" going out of scope leaks the storage
it points to.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-04-10 01:26:59 +04:00
committed by Pavel Emelyanov
parent edc865361e
commit 6a49f82fb6
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mount.c
View File

@@ -633,6 +633,37 @@ static int cr_pivot_root()
return 0;
}
struct mount_info *mnt_entry_alloc()
{
struct mount_info *new;
new = xmalloc(sizeof(struct mount_info));
if (new == NULL)
return NULL;
new->root = NULL;
new->mountpoint = NULL;
new->source = NULL;
new->options = NULL;
new->parent = NULL;
INIT_LIST_HEAD(&new->children);
return new;
}
void mnt_entry_free(struct mount_info *mi)
{
if (mi == NULL)
return;
xfree(mi->root);
xfree(mi->mountpoint);
xfree(mi->source);
xfree(mi->options);
xfree(mi);
}
static int populate_mnt_ns(int ns_pid)
{
MntEntry *me = NULL;
@@ -654,11 +685,12 @@ static int populate_mnt_ns(int ns_pid)
if (ret <= 0)
break;
pm = xmalloc(sizeof(*pm));
pm = mnt_entry_alloc();
if (!pm)
goto err;
mnt_entry_init(pm);
pm->next = pms;
pms = pm;
pm->mnt_id = me->mnt_id;
pm->parent_mnt_id = me->parent_mnt_id;
@@ -689,8 +721,6 @@ static int populate_mnt_ns(int ns_pid)
goto err;
pr_debug("\tRead %d mp @ %s\n", pm->mnt_id, pm->mountpoint);
pm->next = pms;
pms = pm;
}
if (me)
@@ -708,7 +738,7 @@ err:
while (pms) {
struct mount_info *pm = pms;
pms = pm->next;
xfree(pm);
mnt_entry_free(pm);
}
close_safe(&img);
return -1;