tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Delete the checkin directory with the wrong context" am: 2c48d37a29

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

Change-Id: Ia1fd614583176ced6135b8dfb4be8760273d9eec
This commit is contained in:
Tianjie Xu 2021-10-25 21:13:23 +00:00 committed by Automerger Merge Worker
commit 821e6c7db4
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vold_prepare_subdirs.cpp
View file

@ -213,10 +213,18 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
prepare_apex_subdirs(sehandle, misc_ce_path); prepare_apex_subdirs(sehandle, misc_ce_path);
// Give gmscore (who runs in cache group) access to the checkin directory. Also provide // Give gmscore (who runs in cache group) access to the checkin directory. Also provide
// the user id to set the correct selinux mls_level. // the user id to set the correct selinux mls_level.
if (!prepare_dir_for_user(sehandle, 0770, AID_SYSTEM, AID_CACHE,
misc_ce_path + "/checkin", user_id)) {
// TODO(b/203742483) the checkin directory was created with the wrong permission &
// context. Delete the directory to get these devices out of the bad state. Revert
// the change once the droidfood population is on newer build.
LOG(INFO) << "Failed to prepare the checkin directory, deleting for recreation";
android::vold::DeleteDirContentsAndDir(misc_ce_path + "/checkin");
if (!prepare_dir_for_user(sehandle, 0770, AID_SYSTEM, AID_CACHE, if (!prepare_dir_for_user(sehandle, 0770, AID_SYSTEM, AID_CACHE,
misc_ce_path + "/checkin", user_id)) { misc_ce_path + "/checkin", user_id)) {
return false; return false;
} }
}
auto system_ce_path = android::vold::BuildDataSystemCePath(user_id); auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);
if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, system_ce_path + "/backup")) { if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, system_ce_path + "/backup")) {