chown_mapped_rootid: don't double-map root id

If the user maps container root to his host uid, chown_mapped_rootid tries to make the same mapping twice and gets -EINVAL. Reported-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

chown_mapped_rootid: don't double-map root id
f3d7e4ca · Serge Hallyn · Stéphane Graber · 94863add · f3d7e4ca
Commit f3d7e4ca authored Mar 04, 2014 by Serge Hallyn Committed by Stéphane Graber Mar 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

conf.c src/lxc/conf.c +7 -0

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3439,6 +3439,13 @@ int chown_mapped_root(char *path, struct lxc_conf *conf)
 		}
 		return 0;
 	}
+
+	if (rootid == geteuid()) {
+		// nothing to do
+		INFO("%s: container root is our uid;  no need to chown" ,__func__);
+		return 0;
+	}
+
 	pid = fork();
 	if (pid < 0) {
 		SYSERROR("Failed forking");