august/LSPlt
1
0
Fork 0
mirror of https://github.com/LSPosed/LSPlt.git synced 2025-05-06 21:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert 1afe99bb166be7924ca529b6be6f8474902f4838

Browse Source
This commit is contained in:
LoveSy 2023-03-23 16:30:18 +08:00
parent da45e7276c
commit 5d2b820cf9
No known key found for this signature in database
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lsplt/src/main/jni/lsplt.cc
View File

@ -113,7 +113,6 @@ public:
} }
bool DoHook(uintptr_t addr, uintptr_t callback, uintptr_t *backup) { bool DoHook(uintptr_t addr, uintptr_t callback, uintptr_t *backup) {
static bool kSkipRemap = false;
using PAGE = std::array<char, PAGE_SIZE>; using PAGE = std::array<char, PAGE_SIZE>;
LOGV("Hooking %p", reinterpret_cast<void *>(addr)); LOGV("Hooking %p", reinterpret_cast<void *>(addr));
auto iter = lower_bound(addr); auto iter = lower_bound(addr);
@ -122,7 +121,7 @@ public:
auto &info = iter->second; auto &info = iter->second;
if (info.end <= addr) return false; if (info.end <= addr) return false;
const auto len = info.end - info.start; const auto len = info.end - info.start;
while (!info.backup && !info.self && !kSkipRemap) { if (!info.backup && !info.self) {
// let os find a suitable address // let os find a suitable address
auto *backup_addr = sys_mmap(nullptr, len, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0); auto *backup_addr = sys_mmap(nullptr, len, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
LOGD("Backup %p to %p", reinterpret_cast<void *>(addr), backup_addr); LOGD("Backup %p to %p", reinterpret_cast<void *>(addr), backup_addr);
@ -130,8 +129,7 @@ public:
if (auto *new_addr = sys_mremap(reinterpret_cast<void *>(info.start), len, len, if (auto *new_addr = sys_mremap(reinterpret_cast<void *>(info.start), len, len,
MREMAP_FIXED | MREMAP_MAYMOVE, backup_addr); MREMAP_FIXED | MREMAP_MAYMOVE, backup_addr);
new_addr == MAP_FAILED || new_addr != backup_addr) { new_addr == MAP_FAILED || new_addr != backup_addr) {
kSkipRemap = true; return false;
break;
} }
if (auto *new_addr = sys_mmap(reinterpret_cast<void *>(info.start), len, if (auto *new_addr = sys_mmap(reinterpret_cast<void *>(info.start), len,
PROT_READ | PROT_WRITE | info.perms, PROT_READ | PROT_WRITE | info.perms,
@ -146,9 +144,8 @@ public:
*reinterpret_cast<PAGE *>(dest) = *reinterpret_cast<PAGE *>(src); *reinterpret_cast<PAGE *>(dest) = *reinterpret_cast<PAGE *>(src);
} }
info.backup = reinterpret_cast<uintptr_t>(backup_addr); info.backup = reinterpret_cast<uintptr_t>(backup_addr);
break;
} }
if (info.self || !info.backup) { if (info.self) {
// self hooking, no need backup since we are always dirty // self hooking, no need backup since we are always dirty
if (!(info.perms & PROT_WRITE)) { if (!(info.perms & PROT_WRITE)) {
info.perms |= PROT_WRITE; info.perms |= PROT_WRITE;
@ -167,9 +164,11 @@ public:
} else { } else {
info.hooks.emplace(addr, the_backup); info.hooks.emplace(addr, the_backup);
} }
if (info.hooks.empty() && !info.self && info.backup) { if (info.hooks.empty() && !info.self) {
LOGD("Restore %p from %p", reinterpret_cast<void *>(info.start), LOGD("Restore %p from %p", reinterpret_cast<void *>(info.start),
reinterpret_cast<void *>(info.backup)); reinterpret_cast<void *>(info.backup));
// Note that we have to always use sys_mremap here,
// see https://cs.android.com/android/_/android/platform/bionic/+/4200e260d266fd0c176e71fbd720d0bab04b02db
if (auto *new_addr = if (auto *new_addr =
sys_mremap(reinterpret_cast<void *>(info.backup), len, len, sys_mremap(reinterpret_cast<void *>(info.backup), len, len,
MREMAP_FIXED | MREMAP_MAYMOVE, reinterpret_cast<void *>(info.start)); MREMAP_FIXED | MREMAP_MAYMOVE, reinterpret_cast<void *>(info.start));