From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 4 Mar 2014 15:58:30 +0000 (-0600)
Subject: chown_mapped_rootid: don't double-map root id
X-Git-Tag: lxc-1.1.0.alpha1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3d7e4ca9230d13dc446dd0ef00dd74b2c11bab6;p=thirdparty%2Flxc.git

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>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 26223710e..1cb058d0c 100644
--- 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");