WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix implementation of UnhookPLT 

Currently, inline_unhooker is not used in the code.
We still fix the logic to avoid confusion.

There is no feasible way to determinate if the parameter original is a
valid function pointer or a `const char` pointer.
We suppose it as a char pointer in the first step.
This commit is contained in:
JingMatrix 2024-09-23 15:14:58 +02:00
parent e55ecdf67c
commit bb869eac2d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
magisk-loader/src/main/jni/src/magisk_loader.cpp
View File

@ -123,19 +123,19 @@ void MagiskLoader::InitializeZygiskApi(zygisk::Api *api) {
}; };
auto UnhookPLT = [HookPLT, &plt_hook_saved](void *original) { auto UnhookPLT = [HookPLT, &plt_hook_saved](void *original) {
Dl_info info;
if (!dladdr(original, &info) || info.dli_sname != nullptr) return 1;
if (!GetArt()->isStripped()) return UnhookInline(original); if (!GetArt()->isStripped()) return UnhookInline(original);
auto symbol = reinterpret_cast<const char *>(original);
auto hook_iter = auto hook_iter =
std::find_if(plt_hook_saved.begin(), plt_hook_saved.end(), std::find_if(plt_hook_saved.begin(), plt_hook_saved.end(),
[info](auto record) { return strcmp(record.first, info.dli_sname) == 0; }); [symbol](auto record) { return strcmp(record.first, symbol) == 0; });
void *stub = nullptr; void *stub = nullptr;
if (hook_iter != plt_hook_saved.end() && if (hook_iter != plt_hook_saved.end() &&
HookPLT(original, *(hook_iter->second), &stub, false)) { HookPLT(original, *(hook_iter->second), &stub, false)) {
plt_hook_saved.erase(hook_iter); plt_hook_saved.erase(hook_iter);
return 0; return 0;
} else {
return UnhookInline(original);
} }
return 1; return 1;
}; };