fix(tng): 适配 Promon 1.9.10 vhvlnqgy 包名并加固 Zygisk 信号跳过

1.9.10 将 xwwqazamx 重命名为 vhvlnqgy，Login 闪退为 vhvlnqgy.bd:16；Xposed 双包名解析并 short-circuit R/bl、拦截 bd 异常。Zygisk 扩展 non-promon SEGV pc+4 与 ABRT/TRAP 一律 pc+4，修复 Login 稳定；注册页 stack_chk abort 待续攻。

magisk-modules/tng_exit_guard/jni/main.cpp

@@ -42,8 +42,14 @@ static std::atomic<int> g_stack_chk{0};
 static std::atomic<int> g_promon_segv{0};
 static std::atomic<uintptr_t> g_promon_start{0};
 static std::atomic<uintptr_t> g_promon_end{0};
-/* 隔离进程 :goacqowmmt 会循环 SEGV；cap=16 打满后 freeze 反拖累主进程 */
-static constexpr int kMaxPromonSegvSkip = 0; /* 0 = unlimited LR-return skip */
+static std::atomic<pid_t> g_main_tid{0};
+static std::atomic<int> g_abrt_swallow{0};
+static std::atomic<pid_t> g_abrt_last_tid{0};
+static std::atomic<uintptr_t> g_abrt_last_pc{0};
+static std::atomic<int> g_abrt_streak{0};
+/* 隔离进程 :goacqowmmt 会循环 SEGV；主进程 worker 也狂刷。cap 后 freeze 该线程 */
+static constexpr int kMaxPromonSegvSkip = 200;
+static constexpr int kMaxAbrtStreak = 3;
 static std::atomic<int> g_soft_sig_logged{0};
 
 static void freeze_forever() {
@@ -119,18 +125,30 @@ static void promon_segv_handler(int sig, siginfo_t *info, void *ctx) {
         LOGI("promon SIGSEGV tid=%d n=%d — cap hit, freeze", (int)gettid(), n);
         freeze_forever();
     }
-    signal(SIGSEGV, SIG_DFL);
-    raise(SIGSEGV);
+    /* 1.9.10：Login 后出现 Promon so 外 SEGV → 旧逻辑 re-raise 直接闪退 */
+    {
+        int n = ++g_promon_segv;
+        pid_t tid = gettid();
+        if (n <= 5 || n % 50 == 0) {
+            LOGI("non-promon SIGSEGV tid=%d pc=%lx lr=%lx n=%d — pc+4",
+                 (int)tid, (unsigned long)pc, (unsigned long)lr, n);
+        }
+        if (n > 200 && tid != g_main_tid.load()) {
+            LOGI("non-promon SEGV storm tid=%d — freeze", (int)tid);
+            freeze_forever();
+        }
+        if (pc != 0) {
+            uc->uc_mcontext.pc = pc + 4;
+            return;
+        }
+    }
+    freeze_forever();
 }
 
-static std::atomic<pid_t> g_main_tid{0};
-static std::atomic<int> g_abrt_swallow{0};
-static std::atomic<pid_t> g_abrt_last_tid{0};
-static std::atomic<uintptr_t> g_abrt_last_pc{0};
-static std::atomic<int> g_abrt_streak{0};
-static constexpr int kMaxAbrtStreak = 3;
-
-/** ABRT/TRAP：pc+4 或远距 LR；同 tid+pc 连触发则 freeze，避免 LR 自旋死循环。 */
+/**
+ * ABRT/TRAP：一律 pc+4。跳远距 LR 会弄坏主线程 Looper（闪退观感）。
+ * 工作线程同 PC 连 abort 超限 → freeze；主线程始终 pc+4。
+ */
 static void fatal_skip_handler(int sig, siginfo_t *info, void *ctx) {
     (void)info;
     ucontext_t *uc = reinterpret_cast<ucontext_t *>(ctx);
@@ -148,39 +166,26 @@ static void fatal_skip_handler(int sig, siginfo_t *info, void *ctx) {
             g_abrt_last_pc.store(pc);
             g_abrt_streak.store(1);
         }
-        if (streak > kMaxAbrtStreak) {
-            if (tid == g_main_tid.load()) {
-                LOGI("ABRT main-thread streak cap tid=%d pc=%lx — pc+4 bail", (int)tid,
-                     (unsigned long)pc);
-                uc->uc_mcontext.pc = pc + 4;
-                g_abrt_streak.store(0);
-                return;
-            }
-            LOGI("ABRT streak cap tid=%d pc=%lx n=%d — freeze thread", (int)tid,
+        if (streak > kMaxAbrtStreak && tid != g_main_tid.load()) {
+            LOGI("ABRT streak cap tid=%d pc=%lx n=%d — freeze worker", (int)tid,
                  (unsigned long)pc, streak);
             freeze_forever();
         }
-        uintptr_t delta = (pc > lr) ? (pc - lr) : (lr - pc);
-        uintptr_t target = pc + 4;
-        /* lr 距 pc 很近时仍在 abort/epilogue 内，跳 LR 会 instant 再 ABRT */
-        if (lr != 0 && delta > 64) {
-            target = lr;
-        }
         int n = ++g_abrt_swallow;
-        if (n <= 3 || n % 100 == 0) {
-            LOGI("ABRT skip tid=%d pc=%lx lr=%lx streak=%d -> %lx", (int)tid,
-                 (unsigned long)pc, (unsigned long)lr, streak,
-                 (unsigned long)target);
+        if (n <= 5 || n % 50 == 0) {
+            LOGI("ABRT pc+4 tid=%d pc=%lx lr=%lx streak=%d", (int)tid,
+                 (unsigned long)pc, (unsigned long)lr, streak);
         }
-        uc->uc_mcontext.pc = target;
+        uc->uc_mcontext.pc = pc + 4;
         return;
     }
 
     if (sig == SIGTRAP) {
-        uintptr_t target = pc != 0 ? pc + 4 : lr;
-        LOGI("TRAP skip tid=%d pc=%lx -> %lx", (int)tid, (unsigned long)pc,
-             (unsigned long)target);
-        uc->uc_mcontext.pc = target;
+        int n = ++g_abrt_swallow;
+        if (n <= 5 || n % 50 == 0) {
+            LOGI("TRAP pc+4 tid=%d pc=%lx", (int)tid, (unsigned long)pc);
+        }
+        uc->uc_mcontext.pc = pc != 0 ? pc + 4 : lr;
         return;
     }
 #endif
@@ -194,7 +199,7 @@ static void install_fatal_skip_handlers() {
     sigemptyset(&sa.sa_mask);
     sigaction(SIGABRT, &sa, nullptr);
     sigaction(SIGTRAP, &sa, nullptr);
-    LOGI("fatal skip handlers (ABRT pc+4/streak-freeze + TRAP pc+4)");
+    LOGI("fatal skip handlers (ABRT/TRAP always pc+4)");
 }
 
 static void install_promon_segv_handler() {
@@ -220,7 +225,7 @@ static void install_soft_signals() {
     sigaction(SIGABRT, &sa, nullptr);
     sigaction(SIGTRAP, &sa, nullptr);
     if (g_soft_sig_logged.fetch_add(1) == 0) {
-        LOGI("soft signals (ABRT streak-freeze + TRAP pc+4)");
+        LOGI("soft signals (ABRT/TRAP always pc+4)");
     }
 }
 
@@ -386,7 +391,7 @@ static void *phase_thread(void *) {
 
 static void install_all(zygisk::Api *api) {
     g_main_tid.store(gettid());
-    LOGI("install pid=%d main_tid=%d (PLT+ABRT-streak-freeze+TRAP+pc==lr-SEGV+exit_group@400ms)",
+    LOGI("install pid=%d main_tid=%d (PLT+ABRT-pc+4+SEGV-all-skip+exit_group@400ms)",
          getpid(), (int)g_main_tid.load());
     install_fatal_skip_handlers();
     install_soft_signals();