From d4ac458d17ccf693ded67ede5980f80a18539af1 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Fri, 12 Nov 2021 21:11:53 +0800
Subject: [PATCH] Ignore zygisk modules when zygisk is not enabled

---
 native/jni/core/module.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/native/jni/core/module.cpp b/native/jni/core/module.cpp
index 03682bcba..bda3cb6c7 100644
--- a/native/jni/core/module.cpp
+++ b/native/jni/core/module.cpp
@@ -705,8 +705,10 @@ static void collect_modules(bool open_zygisk) {
         module_info info;
         if (zygisk_enabled) {
             // 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;
+            }
             if (open_zygisk) {
 #if defined(__arm__)
                 info.z32 = openat(modfd, "zygisk/armeabi-v7a.so", O_RDONLY | O_CLOEXEC);
@@ -722,6 +724,12 @@ static void collect_modules(bool open_zygisk) {
 #error Unsupported ABI
 #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;
         modules->push_back(info);