commit bff86152e5e30b25c1e9a8cd8815dbfb2a2235ad
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 03 08:13:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 03 08:13:47 2020 +0000
tree 779ada7d6740824c1239f4e1a61f1047a0135700
parent 7b40c8e2b21e16f8efbce2cebc457e5d35b46eea
parent 26eec7049ba73d0522ae966027224748857654cd

Merge "Harden /mnt/pass_through paths"

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 4720645..3915667 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1062,13 +1062,13 @@
         return -1;
     }
 
-    result = PrepareDir(pre_pass_through_path, 0755, AID_ROOT, AID_ROOT);
+    result = PrepareDir(pre_pass_through_path, 0710, AID_ROOT, AID_MEDIA_RW);
     if (result != android::OK) {
         PLOG(ERROR) << "Failed to prepare directory " << pre_pass_through_path;
         return -1;
     }
 
-    result = PrepareDir(pass_through_path, 0755, AID_ROOT, AID_ROOT);
+    result = PrepareDir(pass_through_path, 0710, AID_ROOT, AID_MEDIA_RW);
     if (result != android::OK) {
         PLOG(ERROR) << "Failed to prepare directory " << pass_through_path;
         return -1;
@@ -1085,7 +1085,7 @@
         Symlink("/storage/emulated/" + std::to_string(user_id), linkpath);
 
         std::string pass_through_linkpath(StringPrintf("/mnt/pass_through/%d/self", user_id));
-        result = PrepareDir(pass_through_linkpath, 0755, AID_ROOT, AID_ROOT);
+        result = PrepareDir(pass_through_linkpath, 0710, AID_ROOT, AID_MEDIA_RW);
         if (result != android::OK) {
             PLOG(ERROR) << "Failed to prepare directory " << pass_through_linkpath;
             return -1;