Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always delete old idmap in createIdmap" into sc-dev

Browse Source
This commit is contained in:
Ryan Mitchell
2021-02-10 23:28:09 +00:00
committed by Android (Google) Code Review
parent 9a473648ba b49cb5ecea
commit 651112fbeb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmds/idmap2/idmap2d/Idmap2Service.cpp
View File

@@ -161,6 +161,12 @@ Status Idmap2Service::createIdmap(const std::string& target_path, const std::str
idmap_path.c_str(), uid));
}
// idmap files are mapped with mmap in libandroidfw. Deleting and recreating the idmap guarantees
// that existing memory maps will continue to be valid and unaffected. The file must be deleted
// before attempting to create the idmap, so that if idmap creation fails, the overlay will no
// longer be usable.
unlink(idmap_path.c_str());
const auto target = GetTargetContainer(target_path);
if (!target) {
return error("failed to load target '%s'" + target_path);
@@ -177,10 +183,6 @@ Status Idmap2Service::createIdmap(const std::string& target_path, const std::str
return error(idmap.GetErrorMessage());
}
// idmap files are mapped with mmap in libandroidfw. Deleting and recreating the idmap guarantees
// that existing memory maps will continue to be valid and unaffected.
unlink(idmap_path.c_str());
umask(kIdmapFilePermissionMask);
std::ofstream fout(idmap_path);
if (fout.fail()) {