Skip to content

L
lxc
Commit a7307747 by Serge Hallyn
Options

coverity: free 'result' in error case.

Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 8ec0243d
Showing with 13 additions and 2 deletions
src/lxc/conf.c
...@@ -4564,6 +4564,17 @@ void suggest_default_idmap(void) ...@@ -4564,6 +4564,17 @@ void suggest_default_idmap(void)
free(uname); free(uname);
} }
static void free_cgroup_settings(struct lxc_list *result)
{
struct lxc_list *iterator, *next;
lxc_list_for_each_safe(iterator, result, next) {
lxc_list_del(iterator);
free(iterator);
}
free(result);
}
/* /*
* Return the list of cgroup_settings sorted according to the following rules * Return the list of cgroup_settings sorted according to the following rules
* 1. Put memory.limit_in_bytes before memory.memsw.limit_in_bytes * 1. Put memory.limit_in_bytes before memory.memsw.limit_in_bytes
...@@ -4588,6 +4599,7 @@ struct lxc_list *sort_cgroup_settings(struct lxc_list* cgroup_settings) ...@@ -4588,6 +4599,7 @@ struct lxc_list *sort_cgroup_settings(struct lxc_list* cgroup_settings)
item = malloc(sizeof(*item)); item = malloc(sizeof(*item));
if (!item) { if (!item) {
ERROR("failed to allocate memory to sort cgroup settings"); ERROR("failed to allocate memory to sort cgroup settings");
free_cgroup_settings(result);
return NULL; return NULL;
} }
item->elem = it->elem; item->elem = it->elem;
...@@ -4605,4 +4617,4 @@ struct lxc_list *sort_cgroup_settings(struct lxc_list* cgroup_settings) ...@@ -4605,4 +4617,4 @@ struct lxc_list *sort_cgroup_settings(struct lxc_list* cgroup_settings)
} }
return result; return result;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment