commit 011c4df302626613e175f3c753df12fdf43328d2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 15 01:54:17 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 15 01:54:17 2020 +0000
tree ed03d8a527a37828e62f9c75405244bf25278d4e
parent cb4704f3fe46cbd849853290d820f3ef75b1929b
parent c6a5bb31c7e3cdc54d1730445ad12c6137468e52

Merge "Skip android11-tests-dev."

init/subcontext.cpp

diff --git a/init/subcontext.cpp b/init/subcontext.cpp
index 9d4ea8c..dc2455e 100644
--- a/init/subcontext.cpp
+++ b/init/subcontext.cpp
@@ -30,6 +30,7 @@
 
 #include "action.h"
 #include "builtins.h"
+#include "mount_namespace.h"
 #include "proto_utils.h"
 #include "util.h"
 
@@ -217,7 +218,13 @@
                 PLOG(FATAL) << "Could not set execcon for '" << context_ << "'";
             }
         }
-
+#if defined(__ANDROID__)
+        // subcontext init runs in "default" mount namespace
+        // so that it can access /apex/*
+        if (auto result = SwitchToMountNamespaceIfNeeded(NS_DEFAULT); !result.ok()) {
+            LOG(FATAL) << "Could not switch to \"default\" mount namespace: " << result.error();
+        }
+#endif
         auto init_path = GetExecutablePath();
         auto child_fd_string = std::to_string(child_fd);
         const char* args[] = {init_path.c_str(), "subcontext", context_.c_str(),