From 46e81ec324cd93f4a702641d0caa4af406025b85 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 29 Oct 2016 22:47:51 +0200 Subject: [PATCH] cgfs: fix invalid free() And let's be on the safe side by NULLing free()ed variables. Signed-off-by: Christian Brauner --- src/lxc/cgfs.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c index 1accdde01..bdbacf478 100644 --- a/src/lxc/cgfs.c +++ b/src/lxc/cgfs.c @@ -615,10 +615,10 @@ static struct cgroup_meta_data *lxc_cgroup_put_meta(struct cgroup_meta_data *met if (--meta_data->ref > 0) return meta_data; lxc_free_array((void **)meta_data->mount_points, (lxc_free_fn)lxc_cgroup_mount_point_free); - if (meta_data->hierarchies) { + if (meta_data->hierarchies) for (i = 0; i <= meta_data->maximum_hierarchy; i++) - lxc_cgroup_hierarchy_free(meta_data->hierarchies[i]); - } + if (meta_data->hierarchies[i]) + lxc_cgroup_hierarchy_free(meta_data->hierarchies[i]); free(meta_data->hierarchies); free(meta_data); return NULL; @@ -1761,9 +1761,16 @@ static void lxc_cgroup_hierarchy_free(struct cgroup_hierarchy *h) { if (!h) return; - lxc_free_array((void **)h->subsystems, free); - free(h->all_mount_points); + if (h->subsystems) { + lxc_free_array((void **)h->subsystems, free); + h->subsystems = NULL; + } + if (h->all_mount_points) { + free(h->all_mount_points); + h->all_mount_points = NULL; + } free(h); + h = NULL; } static bool is_valid_cgroup(const char *name) -- 2.47.2