TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 00:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log if failed to dlopen a zygisk module

Browse Source
This commit is contained in:
LoveSy 2022-03-15 02:42:47 +08:00 committed by topjohnwu
parent ffcd093db1
commit 69c2f407d6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/zygisk/hook.cpp
View File

@ -367,6 +367,8 @@ void HookContext::run_modules_pre(const vector<int> &fds) {
if (void *e = dlsym(h, "zygisk_module_entry")) { if (void *e = dlsym(h, "zygisk_module_entry")) {
modules.emplace_back(i, h, e); modules.emplace_back(i, h, e);
} }
} else if (g_ctx->state[SERVER_SPECIALIZE]) {
LOGW("Failed to dlopen zygisk module: %s\n", dlerror());
} }
close(fds[i]); close(fds[i]);
} }

11
native/jni/zygisk/main.cpp
View File

@ -112,14 +112,19 @@ static void zygiskd(int socket) {
vector<comp_entry> modules; vector<comp_entry> modules;
{ {
vector<int> module_fds = recv_fds(socket); vector<int> module_fds = recv_fds(socket);
char buf[256];
for (int fd : module_fds) { for (int fd : module_fds) {
snprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd);
comp_entry entry = nullptr; comp_entry entry = nullptr;
if (void *h = dlopen(buf, RTLD_LAZY)) { android_dlextinfo info {
.flags = ANDROID_DLEXT_USE_LIBRARY_FD,
.library_fd = fd,
};
if (void *h = android_dlopen_ext("/jit-cache", RTLD_LAZY, &info)) {
*(void **) &entry = dlsym(h, "zygisk_companion_entry"); *(void **) &entry = dlsym(h, "zygisk_companion_entry");
} else {
LOGW("Failed to dlopen zygisk module: %s\n", dlerror());
} }
modules.push_back(entry); modules.push_back(entry);
close(fd);
} }
} }