commit 55593258acb21c4a854facd9977030c910df0710
author Eric Biggers <ebiggers@google.com> Tue Jun 20 17:54:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 20 17:54:45 2023 +0000
tree 2db35227ac2fdefd835f2b984476416e3f0161c8
parent 01ca68c4f888bb497a23a518abceecf413481e64
parent c73150307af65eadf3afa6d2b1ec9e98cef5bd17

Merge "Remove write permission from file mode of top-level user dirs" am: c73150307a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2617599

Change-Id: I05ddef6a233b326b44d1de36c1a3aeecba1c7b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

model/PrivateVolume.cpp

diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index a692ea9..55b8d0b 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -171,11 +171,11 @@
 
     // Verify that common directories are ready to roll
     if (PrepareDir(mPath + "/app", 0771, AID_SYSTEM, AID_SYSTEM) ||
-        PrepareDir(mPath + "/user", 0711, AID_SYSTEM, AID_SYSTEM) ||
-        PrepareDir(mPath + "/user_de", 0711, AID_SYSTEM, AID_SYSTEM) ||
-        PrepareDir(mPath + "/misc_ce", 0711, AID_SYSTEM, AID_SYSTEM) ||
-        PrepareDir(mPath + "/misc_de", 0711, AID_SYSTEM, AID_SYSTEM) ||
-        PrepareDir(mPath + "/media", 0770, AID_MEDIA_RW, AID_MEDIA_RW, attrs) ||
+        PrepareDir(mPath + "/user", 0511, AID_SYSTEM, AID_SYSTEM) ||
+        PrepareDir(mPath + "/user_de", 0511, AID_SYSTEM, AID_SYSTEM) ||
+        PrepareDir(mPath + "/misc_ce", 0511, AID_SYSTEM, AID_SYSTEM) ||
+        PrepareDir(mPath + "/misc_de", 0511, AID_SYSTEM, AID_SYSTEM) ||
+        PrepareDir(mPath + "/media", 0550, AID_MEDIA_RW, AID_MEDIA_RW, attrs) ||
         PrepareDir(mPath + "/media/0", 0770, AID_MEDIA_RW, AID_MEDIA_RW) ||
         PrepareDir(mPath + "/local", 0751, AID_ROOT, AID_ROOT) ||
         PrepareDir(mPath + "/local/tmp", 0771, AID_SHELL, AID_SHELL)) {