Merge pull request #2212 from tych0/cgroup-escape-host-unpriv

cgroups: don't escape if we're not real root

Merge pull request #2212 from tych0/cgroup-escape-host-unpriv
f4328733 · Christian Brauner · GitHub · e3bc3b86 · 8d961e28 · f4328733
Unverified Commit f4328733 authored Mar 13, 2018 by Christian Brauner Committed by GitHub Mar 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cgfsng.c src/lxc/cgroups/cgfsng.c +1 -1

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1368,7 +1368,7 @@ static char *cg_unified_get_current_cgroup(void)
 	bool will_escape;
 	char *copy = NULL;

-	will_escape = (geteuid() == 0);
+	will_escape = !am_host_unpriv();
 	if (will_escape)
 		basecginfo = read_file("/proc/1/cgroup");
 	else