cgfsng: use safe_mount_beneath()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgfsng: use safe_mount_beneath()
bf5f0d7b · Christian Brauner · 594e5f24 · bf5f0d7b
Unverified Commit bf5f0d7b authored Aug 09, 2020 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +11 -3

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1874,9 +1874,17 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 	}

 	/* mount tmpfs */
-	ret = safe_mount(NULL, cgroup_root, "tmpfs",
-			 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
-			 "size=10240k,mode=755", root);
+	ret = safe_mount_beneath(root, NULL, DEFAULT_CGROUP_MOUNTPOINT, "tmpfs",
+				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
+				 "size=10240k,mode=755");
+	if (ret < 0) {
+		if (errno != ENOSYS)
+			return false;
+
+		ret = safe_mount(NULL, cgroup_root, "tmpfs",
+				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
+				 "size=10240k,mode=755", root);
+	}
 	if (ret < 0)
 		return false;