]> git.proxmox.com Git - mirror_lxc.git/blobdiff - src/lxc/cgroups/cgfsng.c
Fix lxc.cgroup2.<controller> on cgroup2-only systems
[mirror_lxc.git] / src / lxc / cgroups / cgfsng.c
index d359b67fcd5377abde8ebcdaef0322f8d480fbdf..e40b8079a18ede6c4ce0ecc50b9c7c5218b3fa9a 100644 (file)
@@ -58,6 +58,7 @@
 #include "config.h"
 #include "log.h"
 #include "macro.h"
+#include "memory_utils.h"
 #include "storage/storage.h"
 #include "utils.h"
 
@@ -231,10 +232,11 @@ static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
 /* Slurp in a whole file */
 static char *read_file(const char *fnam)
 {
-       FILE *f;
-       char *line = NULL, *buf = NULL;
-       size_t len = 0, fulllen = 0;
+       __do_free char *line = NULL;
+       __do_fclose FILE *f = NULL;
        int linelen;
+       char *buf = NULL;
+       size_t len = 0, fulllen = 0;
 
        f = fopen(fnam, "r");
        if (!f)
@@ -243,8 +245,6 @@ static char *read_file(const char *fnam)
                append_line(&buf, fulllen, line, linelen);
                fulllen += linelen;
        }
-       fclose(f);
-       free(line);
        return buf;
 }
 
@@ -380,12 +380,14 @@ static ssize_t get_max_cpus(char *cpulist)
 #define __ISOL_CPUS "/sys/devices/system/cpu/isolated"
 static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
 {
+       __do_free char *cpulist = NULL, *fpath = NULL, *isolcpus = NULL,
+                      *posscpus = NULL;
+       __do_free uint32_t *isolmask = NULL, *possmask = NULL;
        int ret;
        ssize_t i;
-       char *lastslash, *fpath, oldv;
+       char oldv;
+       char *lastslash;
        ssize_t maxisol = 0, maxposs = 0;
-       char *cpulist = NULL, *isolcpus = NULL, *posscpus = NULL;
-       uint32_t *isolmask = NULL, *possmask = NULL;
        bool bret = false, flipped_bit = false;
 
        lastslash = strrchr(path, '/');
@@ -399,58 +401,58 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
        posscpus = read_file(fpath);
        if (!posscpus) {
                SYSERROR("Failed to read file \"%s\"", fpath);
-               goto on_error;
+               return false;
        }
 
        /* Get maximum number of cpus found in possible cpuset. */
        maxposs = get_max_cpus(posscpus);
        if (maxposs < 0 || maxposs >= INT_MAX - 1)
-               goto on_error;
+               return false;
 
        if (!file_exists(__ISOL_CPUS)) {
                /* This system doesn't expose isolated cpus. */
                DEBUG("The path \""__ISOL_CPUS"\" to read isolated cpus from does not exist");
-               cpulist = posscpus;
                /* No isolated cpus but we weren't already initialized by
                 * someone. We should simply copy the parents cpuset.cpus
                 * values.
                 */
                if (!am_initialized) {
                        DEBUG("Copying cpu settings of parent cgroup");
+                       cpulist = posscpus;
                        goto copy_parent;
                }
                /* No isolated cpus but we were already initialized by someone.
                 * Nothing more to do for us.
                 */
-               goto on_success;
+               return true;
        }
 
        isolcpus = read_file(__ISOL_CPUS);
        if (!isolcpus) {
                SYSERROR("Failed to read file \""__ISOL_CPUS"\"");
-               goto on_error;
+               return false;
        }
        if (!isdigit(isolcpus[0])) {
                TRACE("No isolated cpus detected");
-               cpulist = posscpus;
                /* No isolated cpus but we weren't already initialized by
                 * someone. We should simply copy the parents cpuset.cpus
                 * values.
                 */
                if (!am_initialized) {
                        DEBUG("Copying cpu settings of parent cgroup");
+                       cpulist = posscpus;
                        goto copy_parent;
                }
                /* No isolated cpus but we were already initialized by someone.
                 * Nothing more to do for us.
                 */
-               goto on_success;
+               return true;
        }
 
        /* Get maximum number of cpus found in isolated cpuset. */
        maxisol = get_max_cpus(isolcpus);
        if (maxisol < 0 || maxisol >= INT_MAX - 1)
-               goto on_error;
+               return false;
 
        if (maxposs < maxisol)
                maxposs = maxisol;
@@ -459,13 +461,13 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
        possmask = lxc_cpumask(posscpus, maxposs);
        if (!possmask) {
                ERROR("Failed to create cpumask for possible cpus");
-               goto on_error;
+               return false;
        }
 
        isolmask = lxc_cpumask(isolcpus, maxposs);
        if (!isolmask) {
                ERROR("Failed to create cpumask for isolated cpus");
-               goto on_error;
+               return false;
        }
 
        for (i = 0; i <= maxposs; i++) {
@@ -478,50 +480,38 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
 
        if (!flipped_bit) {
                DEBUG("No isolated cpus present in cpuset");
-               goto on_success;
+               return true;
        }
        DEBUG("Removed isolated cpus from cpuset");
 
        cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
        if (!cpulist) {
                ERROR("Failed to create cpu list");
-               goto on_error;
+               return false;
        }
 
 copy_parent:
        *lastslash = oldv;
-       free(fpath);
        fpath = must_make_path(path, "cpuset.cpus", NULL);
        ret = lxc_write_to_file(fpath, cpulist, strlen(cpulist), false, 0666);
+       if (cpulist == posscpus)
+               cpulist = NULL;
        if (ret < 0) {
                SYSERROR("Failed to write cpu list to \"%s\"", fpath);
-               goto on_error;
+               return false;
        }
 
-on_success:
-       bret = true;
-
-on_error:
-       free(fpath);
-
-       free(isolcpus);
-       free(isolmask);
-
-       if (posscpus != cpulist)
-               free(posscpus);
-       free(possmask);
-
-       free(cpulist);
-       return bret;
+       return true;
 }
 
 /* Copy contents of parent(@path)/@file to @path/@file */
 static bool copy_parent_file(char *path, char *file)
 {
+       __do_free char *child_path = NULL, *parent_path = NULL, *value = NULL;
        int ret;
-       char *fpath, *lastslash, oldv;
+       char oldv;
        int len = 0;
-       char *value = NULL;
+       char *lastslash = NULL;
 
        lastslash = strrchr(path, '/');
        if (!lastslash) {
@@ -530,30 +520,25 @@ static bool copy_parent_file(char *path, char *file)
        }
        oldv = *lastslash;
        *lastslash = '\0';
-       fpath = must_make_path(path, file, NULL);
-       len = lxc_read_from_file(fpath, NULL, 0);
+       parent_path = must_make_path(path, file, NULL);
+       len = lxc_read_from_file(parent_path, NULL, 0);
        if (len <= 0)
                goto on_error;
 
        value = must_realloc(NULL, len + 1);
-       ret = lxc_read_from_file(fpath, value, len);
+       ret = lxc_read_from_file(parent_path, value, len);
        if (ret != len)
                goto on_error;
-       free(fpath);
 
        *lastslash = oldv;
-       fpath = must_make_path(path, file, NULL);
-       ret = lxc_write_to_file(fpath, value, len, false, 0666);
+       child_path = must_make_path(path, file, NULL);
+       ret = lxc_write_to_file(child_path, value, len, false, 0666);
        if (ret < 0)
-               SYSERROR("Failed to write \"%s\" to file \"%s\"", value, fpath);
-       free(fpath);
-       free(value);
+               SYSERROR("Failed to write \"%s\" to file \"%s\"", value, child_path);
        return ret >= 0;
 
 on_error:
-       SYSERROR("Failed to read file \"%s\"", fpath);
-       free(fpath);
-       free(value);
+       SYSERROR("Failed to read file \"%s\"", child_path);
        return false;
 }
 
@@ -564,9 +549,10 @@ on_error:
  */
 static bool cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
 {
+       __do_free char *cgpath = NULL, *clonechildrenpath = NULL;
        int ret;
        char v;
-       char *cgpath, *clonechildrenpath, *slash;
+       char *slash;
 
        if (!string_in_list(h->controllers, "cpuset"))
                return true;
@@ -585,60 +571,46 @@ static bool cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
        if (ret < 0) {
                if (errno != EEXIST) {
                        SYSERROR("Failed to create directory \"%s\"", cgpath);
-                       free(cgpath);
                        return false;
                }
        }
 
        clonechildrenpath = must_make_path(cgpath, "cgroup.clone_children", NULL);
        /* unified hierarchy doesn't have clone_children */
-       if (!file_exists(clonechildrenpath)) {
-               free(clonechildrenpath);
-               free(cgpath);
+       if (!file_exists(clonechildrenpath))
                return true;
-       }
 
        ret = lxc_read_from_file(clonechildrenpath, &v, 1);
        if (ret < 0) {
                SYSERROR("Failed to read file \"%s\"", clonechildrenpath);
-               free(clonechildrenpath);
-               free(cgpath);
                return false;
        }
 
        /* Make sure any isolated cpus are removed from cpuset.cpus. */
        if (!cg_legacy_filter_and_set_cpus(cgpath, v == '1')) {
                SYSERROR("Failed to remove isolated cpus");
-               free(clonechildrenpath);
-               free(cgpath);
                return false;
        }
 
        /* Already set for us by someone else. */
        if (v == '1') {
                DEBUG("\"cgroup.clone_children\" was already set to \"1\"");
-               free(clonechildrenpath);
-               free(cgpath);
                return true;
        }
 
        /* copy parent's settings */
        if (!copy_parent_file(cgpath, "cpuset.mems")) {
                SYSERROR("Failed to copy \"cpuset.mems\" settings");
-               free(cgpath);
-               free(clonechildrenpath);
                return false;
        }
-       free(cgpath);
 
        ret = lxc_write_to_file(clonechildrenpath, "1", 1, false, 0666);
        if (ret < 0) {
                /* Set clone_children so children inherit our settings */
                SYSERROR("Failed to write 1 to \"%s\"", clonechildrenpath);
-               free(clonechildrenpath);
                return false;
        }
-       free(clonechildrenpath);
+
        return true;
 }
 
@@ -727,7 +699,7 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
         * for legacy hierarchies.
         */
        int i;
-       char *dup, *p2, *tok;
+       char *p2, *tok;
        char *p = line, *sep = ",";
        char **aret = NULL;
 
@@ -755,19 +727,18 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
        *p2 = '\0';
 
        if (type == CGROUP_SUPER_MAGIC) {
+               __do_free char *dup = NULL;
+
                /* strdup() here for v1 hierarchies. Otherwise
                 * lxc_iterate_parts() will destroy mountpoints such as
                 * "/sys/fs/cgroup/cpu,cpuacct".
                 */
-               dup = strdup(p);
+               dup = must_copy_string(p);
                if (!dup)
                        return NULL;
 
-               lxc_iterate_parts(tok, dup, sep) {
+               lxc_iterate_parts (tok, dup, sep)
                        must_append_controller(klist, nlist, &aret, tok);
-               }
-
-               free(dup);
        }
        *p2 = ' ';
 
@@ -786,7 +757,8 @@ static char **cg_unified_make_empty_controller(void)
 
 static char **cg_unified_get_controllers(const char *file)
 {
-       char *buf, *tok;
+       __do_free char *buf = NULL;
+       char *tok;
        char *sep = " \t\n";
        char **aret = NULL;
 
@@ -803,7 +775,6 @@ static char **cg_unified_get_controllers(const char *file)
                aret[newentry] = copy;
        }
 
-       free(buf);
        return aret;
 }
 
@@ -880,7 +851,8 @@ static char *copy_to_eol(char *p)
  */
 static bool controller_in_clist(char *cgline, char *c)
 {
-       char *tok, *eol, *tmp;
+       __do_free char *tmp = NULL;
+       char *tok, *eol;
        size_t len;
 
        eol = strchr(cgline, ':');
@@ -888,14 +860,13 @@ static bool controller_in_clist(char *cgline, char *c)
                return false;
 
        len = eol - cgline;
-       tmp = alloca(len + 1);
+       tmp = must_realloc(NULL, len + 1);
        memcpy(tmp, cgline, len);
        tmp[len] = '\0';
 
-       lxc_iterate_parts(tok, tmp, ",") {
+       lxc_iterate_parts(tok, tmp, ",")
                if (strcmp(tok, c) == 0)
                        return true;
-       }
 
        return false;
 }
@@ -947,8 +918,8 @@ static void must_append_string(char ***list, char *entry)
 
 static int get_existing_subsystems(char ***klist, char ***nlist)
 {
-       FILE *f;
-       char *line = NULL;
+       __do_free char *line = NULL;
+       __do_fclose FILE *f = NULL;
        size_t len = 0;
 
        f = fopen("/proc/self/cgroup", "r");
@@ -986,8 +957,6 @@ static int get_existing_subsystems(char ***klist, char ***nlist)
                }
        }
 
-       free(line);
-       fclose(f);
        return 0;
 }
 
@@ -1132,7 +1101,6 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
                                                struct lxc_handler *handler)
 {
        int len;
-       char *pivot_path;
        struct lxc_conf *conf = handler->conf;
        char pidstr[INTTYPE_TO_STRLEN(pid_t)];
 
@@ -1144,6 +1112,7 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
                return;
 
        for (int i = 0; ops->hierarchies[i]; i++) {
+               __do_free char *pivot_path = NULL;
                int ret;
                char *chop;
                char pivot_cgroup[] = PIVOT_CGROUP;
@@ -1174,13 +1143,13 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
                 */
                if (!cg_legacy_handle_cpuset_hierarchy(h, pivot_cgroup)) {
                        WARN("Failed to handle legacy cpuset controller");
-                       goto next;
+                       continue;
                }
 
                ret = mkdir_p(pivot_path, 0755);
                if (ret < 0 && errno != EEXIST) {
                        SYSWARN("Failed to create cgroup \"%s\"\n", pivot_path);
-                       goto next;
+                       continue;
                }
 
                if (chop)
@@ -1192,24 +1161,21 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
                ret = lxc_write_to_file(pivot_path, pidstr, len, false, 0666);
                if (ret != 0) {
                        SYSWARN("Failed to move monitor %s to \"%s\"\n", pidstr, pivot_path);
-                       goto next;
+                       continue;
                }
 
                ret = recursive_destroy(h->monitor_full_path);
                if (ret < 0)
                        WARN("Failed to destroy \"%s\"", h->monitor_full_path);
-
-       next:
-               free(pivot_path);
        }
 }
 
 static bool cg_unified_create_cgroup(struct hierarchy *h, char *cgname)
 {
+       __do_free char *add_controllers = NULL, *cgroup = NULL;
        size_t i, parts_len;
        char **it;
        size_t full_len = 0;
-       char *add_controllers = NULL, *cgroup = NULL;
        char **parts = NULL;
        bool bret = false;
 
@@ -1250,12 +1216,11 @@ static bool cg_unified_create_cgroup(struct hierarchy *h, char *cgname)
        cgroup = must_make_path(h->mountpoint, h->container_base_path, NULL);
        for (i = 0; i < parts_len; i++) {
                int ret;
-               char *target;
+               __do_free char *target = NULL;
 
                cgroup = must_append_path(cgroup, parts[i], NULL);
                target = must_make_path(cgroup, "cgroup.subtree_control", NULL);
                ret = lxc_write_to_file(target, add_controllers, full_len, false, 0666);
-               free(target);
                if (ret < 0) {
                        SYSERROR("Could not enable \"%s\" controllers in the "
                                 "unified cgroup \"%s\"", add_controllers, cgroup);
@@ -1267,8 +1232,6 @@ static bool cg_unified_create_cgroup(struct hierarchy *h, char *cgname)
 
 on_error:
        lxc_free_array((void **)parts, free);
-       free(add_controllers);
-       free(cgroup);
        return bret;
 }
 
@@ -1280,9 +1243,9 @@ static int mkdir_eexist_on_last(const char *dir, mode_t mode)
 
        orig_len = strlen(dir);
        do {
+               __do_free char *makeme;
                int ret;
                size_t cur_len;
-               char *makeme;
 
                dir = tmp + strspn(tmp, "/");
                tmp = dir + strcspn(dir, "/");
@@ -1297,12 +1260,9 @@ static int mkdir_eexist_on_last(const char *dir, mode_t mode)
                if (ret < 0) {
                        if ((errno != EEXIST) || (orig_len == cur_len)) {
                                SYSERROR("Failed to create directory \"%s\"", makeme);
-                               free(makeme);
                                return -1;
                        }
                }
-               free(makeme);
-
        } while (tmp != dir);
 
        return 0;
@@ -1369,16 +1329,16 @@ static void remove_path_for_hierarchy(struct hierarchy *h, char *cgname, bool mo
 }
 
 __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
-                                                       struct lxc_handler *handler)
+                                                     struct lxc_handler *handler)
 {
-       char *monitor_cgroup, *offset, *tmp;
+       __do_free char *monitor_cgroup = NULL;
+       char *offset, *tmp;
        int i, idx = 0;
        size_t len;
-       bool bret = false;
        struct lxc_conf *conf = handler->conf;
 
        if (!conf)
-               return bret;
+               return false;
 
        if (!ops->hierarchies)
                return true;
@@ -1392,7 +1352,7 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
        else
                tmp = must_make_path(ops->monitor_pattern, handler->name, NULL);
        if (!tmp)
-               return bret;
+               return false;
 
        len = strlen(tmp) + 5; /* leave room for -NNN\0 */
        monitor_cgroup = must_realloc(tmp, len);
@@ -1403,14 +1363,18 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
                if (idx) {
                        int ret = snprintf(offset, 5, "-%d", idx);
                        if (ret < 0 || (size_t)ret >= 5)
-                               goto on_error;
+                               return false;
                }
 
                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);
+                       if (!monitor_create_path_for_hierarchy(ops->hierarchies[i],
+                                                              monitor_cgroup)) {
+                               ERROR("Failed to create cgroup \"%s\"",
+                                     ops->hierarchies[i]->monitor_full_path);
                                for (int j = 0; j < i; j++)
-                                       remove_path_for_hierarchy(ops->hierarchies[j], monitor_cgroup, true);
+                                       remove_path_for_hierarchy(ops->hierarchies[j],
+                                                                 monitor_cgroup,
+                                                                 true);
 
                                idx++;
                                break;
@@ -1418,15 +1382,11 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
                }
        } while (ops->hierarchies[i] && idx > 0 && idx < 1000);
 
-       if (idx < 1000) {
-               bret = true;
-               INFO("The monitor process uses \"%s\" as cgroup", monitor_cgroup);
-       }
-
-on_error:
-       free(monitor_cgroup);
+       if (idx == 1000)
+               return false;
 
-       return bret;
+       INFO("The monitor process uses \"%s\" as cgroup", monitor_cgroup);
+       return true;
 }
 
 /* Try to create the same cgroup in all hierarchies. Start with cgroup_pattern;
@@ -1435,16 +1395,15 @@ on_error:
 __cgfsng_ops static inline bool cgfsng_payload_create(struct cgroup_ops *ops,
                                                        struct lxc_handler *handler)
 {
+       __do_free char *container_cgroup = NULL, *tmp = NULL;
        int i;
        size_t len;
-       char *container_cgroup, *offset, *tmp;
+       char *offset;
        int idx = 0;
        struct lxc_conf *conf = handler->conf;
 
-       if (ops->container_cgroup) {
-               WARN("cgfsng_create called a second time: %s", ops->container_cgroup);
+       if (ops->container_cgroup)
                return false;
-       }
 
        if (!conf)
                return false;
@@ -1464,49 +1423,36 @@ __cgfsng_ops static inline bool cgfsng_payload_create(struct cgroup_ops *ops,
        len = strlen(tmp) + 5; /* leave room for -NNN\0 */
        container_cgroup = must_realloc(NULL, len);
        (void)strlcpy(container_cgroup, tmp, len);
-       free(tmp);
        offset = container_cgroup + len - 5;
 
-again:
-       if (idx == 1000) {
-               ERROR("Too many conflicting cgroup names");
-               goto out_free;
-       }
-
-       if (idx) {
-               int ret;
-
-               ret = snprintf(offset, 5, "-%d", idx);
-               if (ret < 0 || (size_t)ret >= 5) {
-                       FILE *f = fopen("/dev/null", "w");
-                       if (f) {
-                               fprintf(f, "Workaround for GCC7 bug: "
-                                          "https://gcc.gnu.org/bugzilla/"
-                                          "show_bug.cgi?id=78969");
-                               fclose(f);
-                       }
+       do {
+               if (idx) {
+                       int ret = snprintf(offset, 5, "-%d", idx);
+                       if (ret < 0 || (size_t)ret >= 5)
+                               return false;
                }
-       }
 
-       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);
-                       for (int j = 0; j < i; j++)
-                               remove_path_for_hierarchy(ops->hierarchies[j], container_cgroup, false);
-                       idx++;
-                       goto 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);
+                               for (int j = 0; j < i; j++)
+                                       remove_path_for_hierarchy(ops->hierarchies[j],
+                                                                 container_cgroup,
+                                                                 false);
+                               idx++;
+                               break;
+                       }
                }
-       }
+       } while (ops->hierarchies[i] && idx > 0 && idx < 1000);
 
-       ops->container_cgroup = container_cgroup;
-       INFO("The container uses \"%s\" as cgroup", container_cgroup);
+       if (idx == 1000)
+               return false;
 
+       INFO("The container process uses \"%s\" as cgroup", container_cgroup);
+       ops->container_cgroup = move_ptr(container_cgroup);
        return true;
-
-out_free:
-       free(container_cgroup);
-
-       return false;
 }
 
 __cgfsng_ops static bool __do_cgroup_enter(struct cgroup_ops *ops, pid_t pid,
@@ -1524,7 +1470,7 @@ __cgfsng_ops static bool __do_cgroup_enter(struct cgroup_ops *ops, pid_t pid,
 
        for (int i = 0; ops->hierarchies[i]; i++) {
                int ret;
-               char *path;
+               __do_free char *path = NULL;
 
                if (monitor)
                        path = must_make_path(ops->hierarchies[i]->monitor_full_path,
@@ -1535,10 +1481,8 @@ __cgfsng_ops static bool __do_cgroup_enter(struct cgroup_ops *ops, pid_t pid,
                ret = lxc_write_to_file(path, pidstr, len, false, 0666);
                if (ret != 0) {
                        SYSERROR("Failed to enter cgroup \"%s\"", path);
-                       free(path);
                        return false;
                }
-               free(path);
        }
 
        return true;
@@ -1614,7 +1558,7 @@ static int chown_cgroup_wrapper(void *data)
                destuid = 0;
 
        for (i = 0; arg->hierarchies[i]; i++) {
-               char *fullpath;
+               __do_free char *fullpath = NULL;
                char *path = arg->hierarchies[i]->container_full_path;
 
                ret = chowmod(path, destuid, nsgid, 0775);
@@ -1631,12 +1575,10 @@ static int chown_cgroup_wrapper(void *data)
                if (arg->hierarchies[i]->version == CGROUP_SUPER_MAGIC) {
                        fullpath = must_make_path(path, "tasks", NULL);
                        (void)chowmod(fullpath, destuid, nsgid, 0664);
-                       free(fullpath);
                }
 
                fullpath = must_make_path(path, "cgroup.procs", NULL);
                (void)chowmod(fullpath, destuid, nsgid, 0664);
-               free(fullpath);
 
                if (arg->hierarchies[i]->version != CGROUP2_SUPER_MAGIC)
                        continue;
@@ -1644,7 +1586,6 @@ static int chown_cgroup_wrapper(void *data)
                for (char **p = arg->hierarchies[i]->cgroup2_chown; p && *p; p++) {
                        fullpath = must_make_path(path, *p, NULL);
                        (void)chowmod(fullpath, destuid, nsgid, 0664);
-                       free(fullpath);
                }
        }
 
@@ -1693,8 +1634,8 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
                                       char *controllerpath, char *cgpath,
                                       const char *container_cgroup)
 {
+       __do_free char *sourcepath = NULL;
        int ret, remount_flags;
-       char *sourcepath;
        int flags = MS_BIND;
 
        if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
@@ -1727,7 +1668,6 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
        ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
        if (ret < 0) {
                SYSERROR("Failed to mount \"%s\" onto \"%s\"", h->controllers[0], cgpath);
-               free(sourcepath);
                return -1;
        }
        INFO("Mounted \"%s\" onto \"%s\"", h->controllers[0], cgpath);
@@ -1738,13 +1678,11 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
                ret = mount(sourcepath, cgpath, "cgroup", remount_flags, NULL);
                if (ret < 0) {
                        SYSERROR("Failed to remount \"%s\" ro", cgpath);
-                       free(sourcepath);
                        return -1;
                }
                INFO("Remounted %s read-only", cgpath);
        }
 
-       free(sourcepath);
        INFO("Completed second stage cgroup automounts for \"%s\"", cgpath);
        return 0;
 }
@@ -1759,7 +1697,7 @@ static int __cg_mount_direct(int type, struct hierarchy *h,
                             const char *controllerpath)
 {
         int ret;
-        char *controllers = NULL;
+        __do_free char *controllers = NULL;
         char *fstype = "cgroup2";
         unsigned long flags = 0;
 
@@ -1779,7 +1717,6 @@ static int __cg_mount_direct(int type, struct hierarchy *h,
        }
 
        ret = mount("cgroup", controllerpath, fstype, flags, controllers);
-       free(controllers);
        if (ret < 0) {
                SYSERROR("Failed to mount \"%s\" with cgroup filesystem type %s", controllerpath, fstype);
                return -1;
@@ -1808,8 +1745,8 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                                        struct lxc_handler *handler,
                                        const char *root, int type)
 {
+       __do_free char *tmpfspath = NULL;
        int i, ret;
-       char *tmpfspath = NULL;
        bool has_cgns = false, retval = false, wants_force_mount = false;
 
        if (!ops->hierarchies)
@@ -1848,7 +1785,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                goto on_error;
 
        for (i = 0; ops->hierarchies[i]; i++) {
-               char *controllerpath, *path2;
+               __do_free char *controllerpath = NULL, *path2 = NULL;
                struct hierarchy *h = ops->hierarchies[i];
                char *controller = strrchr(h->mountpoint, '/');
 
@@ -1857,15 +1794,12 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                controller++;
 
                controllerpath = must_make_path(tmpfspath, controller, NULL);
-               if (dir_exists(controllerpath)) {
-                       free(controllerpath);
+               if (dir_exists(controllerpath))
                        continue;
-               }
 
                ret = mkdir(controllerpath, 0755);
                if (ret < 0) {
                        SYSERROR("Error creating cgroup path: %s", controllerpath);
-                       free(controllerpath);
                        goto on_error;
                }
 
@@ -1875,7 +1809,6 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                         * need to mount the cgroups manually.
                         */
                        ret = cg_mount_in_cgroup_namespace(type, h, controllerpath);
-                       free(controllerpath);
                        if (ret < 0)
                                goto on_error;
 
@@ -1883,45 +1816,35 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                }
 
                ret = cg_mount_cgroup_full(type, h, controllerpath);
-               if (ret < 0) {
-                       free(controllerpath);
+               if (ret < 0)
                        goto on_error;
-               }
 
-               if (!cg_mount_needs_subdirs(type)) {
-                       free(controllerpath);
+               if (!cg_mount_needs_subdirs(type))
                        continue;
-               }
 
                path2 = must_make_path(controllerpath, h->container_base_path,
                                       ops->container_cgroup, NULL);
                ret = mkdir_p(path2, 0755);
-               if (ret < 0) {
-                       free(controllerpath);
-                       free(path2);
+               if (ret < 0)
                        goto on_error;
-               }
 
                ret = cg_legacy_mount_controllers(type, h, controllerpath,
                                                  path2, ops->container_cgroup);
-               free(controllerpath);
-               free(path2);
                if (ret < 0)
                        goto on_error;
        }
        retval = true;
 
 on_error:
-       free(tmpfspath);
        return retval;
 }
 
 static int recursive_count_nrtasks(char *dirname)
 {
+       __do_free char *path = NULL;
+       __do_closedir DIR *dir = NULL;
        struct dirent *direntp;
-       DIR *dir;
        int count = 0, ret;
-       char *path;
 
        dir = opendir(dirname);
        if (!dir)
@@ -1937,38 +1860,32 @@ static int recursive_count_nrtasks(char *dirname)
                path = must_make_path(dirname, direntp->d_name, NULL);
 
                if (lstat(path, &mystat))
-                       goto next;
+                       continue;
 
                if (!S_ISDIR(mystat.st_mode))
-                       goto next;
+                       continue;
 
                count += recursive_count_nrtasks(path);
-       next:
-               free(path);
        }
 
        path = must_make_path(dirname, "cgroup.procs", NULL);
        ret = lxc_count_file_lines(path);
        if (ret != -1)
                count += ret;
-       free(path);
-
-       (void)closedir(dir);
 
        return count;
 }
 
 __cgfsng_ops static int cgfsng_nrtasks(struct cgroup_ops *ops)
 {
+       __do_free char *path = NULL;
        int count;
-       char *path;
 
        if (!ops->container_cgroup || !ops->hierarchies)
                return -1;
 
        path = must_make_path(ops->hierarchies[0]->container_full_path, NULL);
        count = recursive_count_nrtasks(path);
-       free(path);
        return count;
 }
 
@@ -1983,7 +1900,7 @@ __cgfsng_ops static bool cgfsng_escape(const struct cgroup_ops *ops,
 
        for (i = 0; ops->hierarchies[i]; i++) {
                int ret;
-               char *fullpath;
+               __do_free char *fullpath = NULL;
 
                fullpath = must_make_path(ops->hierarchies[i]->mountpoint,
                                          ops->hierarchies[i]->container_base_path,
@@ -1991,10 +1908,8 @@ __cgfsng_ops static bool cgfsng_escape(const struct cgroup_ops *ops,
                ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
                if (ret != 0) {
                        SYSERROR("Failed to escape to cgroup \"%s\"", fullpath);
-                       free(fullpath);
                        return false;
                }
-               free(fullpath);
        }
 
        return true;
@@ -2039,7 +1954,7 @@ __cgfsng_ops static bool cgfsng_get_hierarchies(struct cgroup_ops *ops, int n, c
 __cgfsng_ops static bool cgfsng_unfreeze(struct cgroup_ops *ops)
 {
        int ret;
-       char *fullpath;
+       __do_free char *fullpath = NULL;
        struct hierarchy *h;
 
        h = get_hierarchy(ops, "freezer");
@@ -2048,7 +1963,6 @@ __cgfsng_ops static bool cgfsng_unfreeze(struct cgroup_ops *ops)
 
        fullpath = must_make_path(h->container_full_path, "freezer.state", NULL);
        ret = lxc_write_to_file(fullpath, THAWED, THAWED_LEN, false, 0666);
-       free(fullpath);
        if (ret < 0)
                return false;
 
@@ -2093,10 +2007,11 @@ static int __cg_unified_attach(const struct hierarchy *h, const char *name,
                               const char *lxcpath, const char *pidstr,
                               size_t pidstr_len, const char *controller)
 {
+       __do_free char *base_path = NULL, *container_cgroup = NULL,
+                      *full_path = NULL;
        int ret;
        size_t len;
        int fret = -1, idx = 0;
-       char *base_path = NULL, *container_cgroup = NULL, *full_path = NULL;
 
        container_cgroup = lxc_cmd_get_cgroup_path(name, lxcpath, controller);
        /* not running */
@@ -2113,8 +2028,6 @@ static int __cg_unified_attach(const struct hierarchy *h, const char *name,
        if (ret == 0)
                goto on_success;
 
-       free(full_path);
-
        len = strlen(base_path) + STRLITERALLEN("/lxc-1000") +
              STRLITERALLEN("/cgroup-procs");
        full_path = must_realloc(NULL, len + 1);
@@ -2148,10 +2061,6 @@ on_success:
                fret = 0;
 
 on_error:
-       free(base_path);
-       free(container_cgroup);
-       free(full_path);
-
        return fret;
 }
 
@@ -2169,7 +2078,7 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops, const char *name,
                return false;
 
        for (i = 0; ops->hierarchies[i]; i++) {
-               char *path;
+               __do_free char *path = NULL;
                char *fullpath = NULL;
                struct hierarchy *h = ops->hierarchies[i];
 
@@ -2188,14 +2097,11 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops, const char *name,
                        continue;
 
                fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs");
-               free(path);
                ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
                if (ret < 0) {
                        SYSERROR("Failed to attach %d to %s", (int)pid, fullpath);
-                       free(fullpath);
                        return false;
                }
-               free(fullpath);
        }
 
        return true;
@@ -2209,15 +2115,13 @@ __cgfsng_ops static int cgfsng_get(struct cgroup_ops *ops, const char *filename,
                                     char *value, size_t len, const char *name,
                                     const char *lxcpath)
 {
-       int ret = -1;
-       size_t controller_len;
-       char *controller, *p, *path;
+       __do_free char *path = NULL;
+       __do_free char *controller = NULL;
+       char *p;
        struct hierarchy *h;
+       int ret = -1;
 
-       controller_len = strlen(filename);
-       controller = alloca(controller_len + 1);
-       (void)strlcpy(controller, filename, controller_len + 1);
-
+       controller = must_copy_string(filename);
        p = strchr(controller, '.');
        if (p)
                *p = '\0';
@@ -2229,13 +2133,11 @@ __cgfsng_ops static int cgfsng_get(struct cgroup_ops *ops, const char *filename,
 
        h = get_hierarchy(ops, controller);
        if (h) {
-               char *fullpath;
+               __do_free char *fullpath = NULL;
 
                fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
                ret = lxc_read_from_file(fullpath, value, len);
-               free(fullpath);
        }
-       free(path);
 
        return ret;
 }
@@ -2248,15 +2150,13 @@ __cgfsng_ops static int cgfsng_set(struct cgroup_ops *ops,
                                     const char *filename, const char *value,
                                     const char *name, const char *lxcpath)
 {
-       int ret = -1;
-       size_t controller_len;
-       char *controller, *p, *path;
+       __do_free char *path = NULL;
+       __do_free char *controller = NULL;
+       char *p;
        struct hierarchy *h;
+       int ret = -1;
 
-       controller_len = strlen(filename);
-       controller = alloca(controller_len + 1);
-       (void)strlcpy(controller, filename, controller_len + 1);
-
+       controller = must_copy_string(filename);
        p = strchr(controller, '.');
        if (p)
                *p = '\0';
@@ -2268,13 +2168,11 @@ __cgfsng_ops static int cgfsng_set(struct cgroup_ops *ops,
 
        h = get_hierarchy(ops, controller);
        if (h) {
-               char *fullpath;
+               __do_free char *fullpath = NULL;
 
                fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
                ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
-               free(fullpath);
        }
-       free(path);
 
        return ret;
 }
@@ -2288,8 +2186,9 @@ __cgfsng_ops static int cgfsng_set(struct cgroup_ops *ops,
  */
 static int convert_devpath(const char *invalue, char *dest)
 {
+       __do_free char *path = NULL;
        int n_parts;
-       char *p, *path, type;
+       char *p, type;
        unsigned long minor, major;
        struct stat sb;
        int ret = -EINVAL;
@@ -2301,7 +2200,7 @@ static int convert_devpath(const char *invalue, char *dest)
         * A '    # comment' would be legal. Technically other text is not
         * legal, we could check for that if we cared to.
         */
-       for (n_parts = 1, p = path; *p && n_parts < 3; p++) {
+       for (n_parts = 1, p = path; *p; p++) {
                if (*p != ' ')
                        continue;
                *p = '\0';
@@ -2353,7 +2252,6 @@ static int convert_devpath(const char *invalue, char *dest)
        ret = 0;
 
 out:
-       free(path);
        return ret;
 }
 
@@ -2363,18 +2261,15 @@ out:
 static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
                              const char *value)
 {
-       size_t len;
-       char *fullpath, *p;
+       __do_free char *controller = NULL;
+       __do_free char *fullpath = NULL;
+       char *p;
        /* "b|c <2^64-1>:<2^64-1> r|w|m" = 47 chars max */
        char converted_value[50];
        struct hierarchy *h;
        int ret = 0;
-       char *controller = NULL;
-
-       len = strlen(filename);
-       controller = alloca(len + 1);
-       (void)strlcpy(controller, filename, len + 1);
 
+       controller = must_copy_string(filename);
        p = strchr(controller, '.');
        if (p)
                *p = '\0';
@@ -2398,7 +2293,6 @@ static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
 
        fullpath = must_make_path(h->container_full_path, filename, NULL);
        ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
-       free(fullpath);
        return ret;
 }
 
@@ -2406,7 +2300,8 @@ static bool __cg_legacy_setup_limits(struct cgroup_ops *ops,
                                     struct lxc_list *cgroup_settings,
                                     bool do_devices)
 {
-       struct lxc_list *iterator, *next, *sorted_cgroup_settings;
+       __do_free struct lxc_list *sorted_cgroup_settings = NULL;
+       struct lxc_list *iterator, *next;
        struct lxc_cgroup *cg;
        bool ret = false;
 
@@ -2446,7 +2341,7 @@ out:
                lxc_list_del(iterator);
                free(iterator);
        }
-       free(sorted_cgroup_settings);
+
        return ret;
 }
 
@@ -2463,13 +2358,12 @@ static bool __cg_unified_setup_limits(struct cgroup_ops *ops,
                return false;
 
        lxc_list_for_each(iterator, cgroup_settings) {
+               __do_free char *fullpath = NULL;
                int ret;
-               char *fullpath;
                struct lxc_cgroup *cg = iterator->elem;
 
                fullpath = must_make_path(h->container_full_path, cg->subsystem, NULL);
                ret = lxc_write_to_file(fullpath, cg->value, strlen(cg->value), false, 0666);
-               free(fullpath);
                if (ret < 0) {
                        SYSERROR("Failed to set \"%s\" to \"%s\"",
                                 cg->subsystem, cg->value);
@@ -2525,7 +2419,7 @@ static bool cgroup_use_wants_controllers(const struct cgroup_ops *ops,
 
 static void cg_unified_delegate(char ***delegate)
 {
-       char *tmp;
+       __do_free char *tmp = NULL;
        int idx;
        char *standard[] = {"cgroup.subtree_control", "cgroup.threads", NULL};
 
@@ -2548,7 +2442,6 @@ static void cg_unified_delegate(char ***delegate)
                        idx = append_null_to_list((void ***)delegate);
                        (*delegate)[idx] = must_copy_string(token);
                }
-               free(tmp);
        }
 }
 
@@ -2558,11 +2451,11 @@ static void cg_unified_delegate(char ***delegate)
 static bool cg_hybrid_init(struct cgroup_ops *ops, bool relative,
                           bool unprivileged)
 {
+       __do_free char *basecginfo = NULL;
+       __do_free char *line = NULL;
+       __do_fclose FILE *f = NULL;
        int ret;
-       char *basecginfo;
-       FILE *f;
        size_t len = 0;
-       char *line = NULL;
        char **klist = NULL, **nlist = NULL;
 
        /* Root spawned containers escape the current cgroup, so use init's
@@ -2578,14 +2471,12 @@ static bool cg_hybrid_init(struct cgroup_ops *ops, bool relative,
        ret = get_existing_subsystems(&klist, &nlist);
        if (ret < 0) {
                ERROR("Failed to retrieve available legacy cgroup controllers");
-               free(basecginfo);
                return false;
        }
 
        f = fopen("/proc/self/mountinfo", "r");
        if (!f) {
                ERROR("Failed to open \"/proc/self/mountinfo\"");
-               free(basecginfo);
                return false;
        }
 
@@ -2688,11 +2579,6 @@ static bool cg_hybrid_init(struct cgroup_ops *ops, bool relative,
        free_string_list(klist);
        free_string_list(nlist);
 
-       free(basecginfo);
-
-       fclose(f);
-       free(line);
-
        TRACE("Writable cgroup hierarchies:");
        lxc_cgfsng_print_hierarchies(ops);
 
@@ -2724,7 +2610,8 @@ static int cg_is_pure_unified(void)
 /* Get current cgroup from /proc/self/cgroup for the cgroupfs v2 hierarchy. */
 static char *cg_unified_get_current_cgroup(bool relative)
 {
-       char *basecginfo, *base_cgroup;
+       __do_free char *basecginfo = NULL;
+       char *base_cgroup;
        char *copy = NULL;
 
        if (!relative && (geteuid() == 0))
@@ -2744,7 +2631,6 @@ static char *cg_unified_get_current_cgroup(bool relative)
                goto cleanup_on_err;
 
 cleanup_on_err:
-       free(basecginfo);
        if (copy)
                trim(copy);
 
@@ -2754,8 +2640,9 @@ cleanup_on_err:
 static int cg_unified_init(struct cgroup_ops *ops, bool relative,
                           bool unprivileged)
 {
+       __do_free char *subtree_path = NULL;
        int ret;
-       char *mountpoint, *subtree_path, *tmp;
+       char *mountpoint;
        char **delegatable;
        struct hierarchy *new;
        char *base_cgroup = NULL;
@@ -2780,7 +2667,6 @@ static int cg_unified_init(struct cgroup_ops *ops, bool relative,
        subtree_path = must_make_path(mountpoint, base_cgroup,
                                      "cgroup.subtree_control", NULL);
        delegatable = cg_unified_get_controllers(subtree_path);
-       free(subtree_path);
        if (!delegatable)
                delegatable = cg_unified_make_empty_controller();
        if (!delegatable[0])
@@ -2798,6 +2684,7 @@ static int cg_unified_init(struct cgroup_ops *ops, bool relative,
                cg_unified_delegate(&new->cgroup2_chown);
 
        ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
+       ops->unified = new;
        return CGROUP2_SUPER_MAGIC;
 }
 
@@ -2809,16 +2696,14 @@ static bool cg_init(struct cgroup_ops *ops, struct lxc_conf *conf)
 
        tmp = lxc_global_config_value("lxc.cgroup.use");
        if (tmp) {
-               char *chop, *cur, *pin;
+               __do_free char *pin = NULL;
+               char *chop, *cur;
 
                pin = must_copy_string(tmp);
                chop = pin;
 
-               lxc_iterate_parts(cur, chop, ",") {
+               lxc_iterate_parts(cur, chop, ",")
                        must_append_string(&ops->cgroup_use, cur);
-               }
-
-               free(pin);
        }
 
        ret = cg_unified_init(ops, relative, !lxc_list_empty(&conf->id_map));