commit feb5d0862e31bd3d998ed4f429d4711403ae3fcf
author Jason Lunz <jason.lunz@gmail.com> Thu Aug 18 13:31:44 2016 +0000
committer Philipp Wollermann <philwo@google.com> Thu Aug 18 17:25:14 2016 +0000
tree 048613d26e98e0084d21c812d245be28d3677092
parent 6b8758d72802afffebdb7d23b965f769e76d6f27

call SetupDirectories after uids are mapped in the user namespace

fixes #1637 (https://github.com/bazelbuild/bazel/issues/1637)

--
Change-Id: I8b8c3596fd2a4c125071406eefd407ca402099dd
Reviewed-on: https://bazel-review.git.corp.google.com/#/c/5410/2
MOS_MIGRATED_REVID=130633667

src/main/tools/linux-sandbox.c

diff --git a/src/main/tools/linux-sandbox.c b/src/main/tools/linux-sandbox.c
index 580225d..23bd024 100644
--- a/src/main/tools/linux-sandbox.c
+++ b/src/main/tools/linux-sandbox.c
@@ -795,14 +795,14 @@
   // outside environment.
   CHECK_CALL(mount("none", "/", NULL, MS_REC | MS_PRIVATE, NULL));
 
-  SetupDirectories();
-
   if (opt.fake_root) {
     SetupUserNamespace(uid, gid, 0, 0);
   } else {
     SetupUserNamespaceForNobody(uid, gid);
   }
 
+  SetupDirectories();
+
   ChangeRoot();
 
   SpawnCommand(opt.args, opt.timeout_secs, false);