Commit d4ac458d authored by vvb2060's avatar vvb2060 Committed by John Wu

Ignore zygisk modules when zygisk is not enabled

parent 93e443c4
...@@ -705,8 +705,10 @@ static void collect_modules(bool open_zygisk) { ...@@ -705,8 +705,10 @@ static void collect_modules(bool open_zygisk) {
module_info info; module_info info;
if (zygisk_enabled) { if (zygisk_enabled) {
// Riru and its modules are not compatible with zygisk // Riru and its modules are not compatible with zygisk
if (entry->d_name == "riru-core"sv || faccessat(modfd, "riru", F_OK, 0) == 0) if (entry->d_name == "riru-core"sv || faccessat(modfd, "riru", F_OK, 0) == 0) {
LOGI("%s: ignore\n", entry->d_name);
return; return;
}
if (open_zygisk) { if (open_zygisk) {
#if defined(__arm__) #if defined(__arm__)
info.z32 = openat(modfd, "zygisk/armeabi-v7a.so", O_RDONLY | O_CLOEXEC); info.z32 = openat(modfd, "zygisk/armeabi-v7a.so", O_RDONLY | O_CLOEXEC);
...@@ -722,6 +724,12 @@ static void collect_modules(bool open_zygisk) { ...@@ -722,6 +724,12 @@ static void collect_modules(bool open_zygisk) {
#error Unsupported ABI #error Unsupported ABI
#endif #endif
} }
} else {
// Ignore zygisk modules when zygisk is not enabled
if (faccessat(modfd, "zygisk", F_OK, 0) == 0) {
LOGI("%s: ignore\n", entry->d_name);
return;
}
} }
info.name = entry->d_name; info.name = entry->d_name;
modules->push_back(info); modules->push_back(info);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment