Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev

1 files changed, 6 insertions, 0 deletions

diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h
index 6f1e231b550d..064e2ed88afc 100644
--- a/core/jni/fd_utils-inl.h
+++ b/core/jni/fd_utils-inl.h
@@ -295,6 +295,12 @@ class FileDescriptorInfo {
       return true;
     }
 
+    // All regular files that are placed under this path are whitelisted automatically.
+    static const std::string kZygoteWhitelistPath = "/vendor/zygote_whitelist/";
+    if (StartsWith(path, kZygoteWhitelistPath) && path.find("/../") == std::string::npos) {
+      return true;
+    }
+
     return false;
   }