]> git.proxmox.com Git - mirror_lxc.git/commitdiff
cgfsng: do not free container_full_path on error
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 7 Jan 2019 15:08:26 +0000 (16:08 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 7 Jan 2019 15:08:26 +0000 (16:08 +0100)
Closes #2741.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index ab99b47c52b08cc9419f028942494521c35c078f..3ab54d2d870190ed8bc6b119c129a009f50363e4 100644 (file)
@@ -1402,9 +1402,6 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
                for (i = 0; ops->hierarchies[i]; i++) {
                        if (!monitor_create_path_for_hierarchy(ops->hierarchies[i], monitor_cgroup)) {
                                ERROR("Failed to create cgroup \"%s\"", ops->hierarchies[i]->monitor_full_path);
-                               free(ops->hierarchies[i]->container_full_path);
-                               ops->hierarchies[i]->container_full_path = NULL;
-
                                for (int j = 0; j < i; j++)
                                        remove_path_for_hierarchy(ops->hierarchies[j], monitor_cgroup, true);
 
@@ -1484,8 +1481,6 @@ again:
        for (i = 0; ops->hierarchies[i]; i++) {
                if (!container_create_path_for_hierarchy(ops->hierarchies[i], container_cgroup)) {
                        ERROR("Failed to create cgroup \"%s\"", ops->hierarchies[i]->container_full_path);
-                       free(ops->hierarchies[i]->container_full_path);
-                       ops->hierarchies[i]->container_full_path = NULL;
                        for (int j = 0; j < i; j++)
                                remove_path_for_hierarchy(ops->hierarchies[j], container_cgroup, false);
                        idx++;