From 0fbf99d6005a906805565e521fa28dabbb8ca4a0 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 20 Feb 2021 00:42:51 +0100 Subject: [PATCH] cgroups: tweak lxc.cgroup.use handling in __cgroup_init() Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 49ae6dee1..d41a8ed88 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -3493,7 +3493,7 @@ static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf) { __do_close int dfd = -EBADF; int ret; - const char *tmp; + const char *controllers_use; if (ops->dfd_mnt_cgroupfs_host >= 0) return ret_errno(EINVAL); @@ -3508,18 +3508,17 @@ static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf) if (dfd < 0) return syserrno(-errno, "Failed to open " DEFAULT_CGROUP_MOUNTPOINT); - tmp = lxc_global_config_value("lxc.cgroup.use"); - if (tmp) { - __do_free char *pin = NULL; - char *chop, *cur; + controllers_use = lxc_global_config_value("lxc.cgroup.use"); + if (controllers_use) { + __do_free char *dup = NULL; + char *it; - pin = strdup(tmp); - if (!pin) + dup = strdup(controllers_use); + if (!dup) return -errno; - chop = pin; - lxc_iterate_parts(cur, chop, ",") - must_append_string(&ops->cgroup_use, cur); + lxc_iterate_parts(it, dup, ",") + must_append_string(&ops->cgroup_use, it); } /* -- 2.47.2