ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: snapuserd: Fix ranges for mlock()" into main

Browse source
This commit is contained in:
Kalesh Singh 2024-02-22 20:27:13 +00:00 • committed by Gerrit Code Review
commit df09f80cf4
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init/snapuserd_transition.cpp
View file

@ -195,22 +195,20 @@ static void LockAllSystemPages() {
return;
}
auto start = reinterpret_cast<const void*>(map.start);
auto len = map.end - map.start;
uint64_t len = android::procinfo::MappedFileSize(map);
if (!len) {
return;
}
if (mlock(start, len) < 0) {
LOG(ERROR) << "mlock failed, " << start << " for " << len << " bytes.";
PLOG(ERROR) << "\"" << map.name << "\": mlock(" << start << ", " << len
<< ") failed: pgoff = " << map.pgoff;
ok = false;
}
};
if (!android::procinfo::ReadProcessMaps(getpid(), callback) || !ok) {
LOG(FATAL) << "Could not process /proc/" << getpid() << "/maps file for init, "
<< "falling back to mlockall().";
if (mlockall(MCL_CURRENT) < 0) {
LOG(FATAL) << "mlockall failed";
}
LOG(FATAL) << "Could not process /proc/" << getpid() << "/maps file for init";
}
}