]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
cgroups: fix flag checking in legacy mount paths
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 15 Feb 2021 12:45:45 +0000 (13:45 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 15 Feb 2021 12:45:45 +0000 (13:45 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index 4974303bc193810361cf82ed3b8c6800b5e62854..59ab79311b9e7bc791dd3c74b4a0cbd93927ae92 100644 (file)
@@ -1726,7 +1726,7 @@ static int cg_legacy_mount_controllers(int cg_flags, struct hierarchy *h,
        int ret, remount_flags;
        int flags = MS_BIND;
 
-       if (cg_flags == LXC_AUTO_CGROUP_RO || cg_flags == LXC_AUTO_CGROUP_MIXED) {
+       if ((cg_flags & LXC_AUTO_CGROUP_RO) || (cg_flags & LXC_AUTO_CGROUP_MIXED)) {
                ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
                if (ret < 0)
                        return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
@@ -1746,7 +1746,7 @@ static int cg_legacy_mount_controllers(int cg_flags, struct hierarchy *h,
 
        sourcepath = must_make_path(h->mountpoint, h->container_base_path,
                                    container_cgroup, NULL);
-       if (cg_flags == LXC_AUTO_CGROUP_RO)
+       if ((cg_flags & LXC_AUTO_CGROUP_RO))
                flags |= MS_RDONLY;
 
        ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);