Fix no crash

luoyesiqiu · Dec 28, 2024 · 4171599 · 4171599
1 parent 70ef20b
commit 4171599
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/shell/src/main/cpp/common/dpt_macro.h b/shell/src/main/cpp/common/dpt_macro.h
@@ -14,6 +14,7 @@
 #define KEEP_SYMBOL __attribute__((visibility("default")))
 #define INIT_ARRAY_SECTION __attribute__ ((constructor))
 #define ALWAYS_INLINE static inline __attribute__((always_inline))
+#define NO_INLINE __attribute__((noinline))
 #define SYS_INLINE ALWAYS_INLINE
 #define DPT_ENCRYPT SECTION(SECTION_NAME_BITCODE)
 #define DPT_DATA_SECTION SECTION(SECTION_NAME_DATA)

diff --git a/shell/src/main/cpp/dpt_hook.cpp b/shell/src/main/cpp/dpt_hook.cpp
@@ -135,7 +135,7 @@ DPT_ENCRYPT void patchClass(__unused const char* descriptor,
         DLOGD("Attempt patch junk class %s ,char is '%c'",descriptor,ch);
         if(isdigit(ch)) {
             DLOGE("Find illegal call, desc: %s!", descriptor);
-            crash();
+            dpt_crash();
             return;
         }
 

diff --git a/shell/src/main/cpp/dpt_risk.cpp b/shell/src/main/cpp/dpt_risk.cpp
@@ -4,7 +4,7 @@
 
 #include "dpt_risk.h"
 
-void crash() {
+DPT_ENCRYPT NO_INLINE void dpt_crash() {
 #ifdef __aarch64__
     asm volatile(
             "mov x30,#0\t\n"
@@ -24,19 +24,19 @@ void crash() {
 #endif
 }
 
-void junkCodeDexProtect(JNIEnv *env) {
+DPT_ENCRYPT void junkCodeDexProtect(JNIEnv *env) {
     jclass klass = dpt::jni::FindClass(env,JUNK_CLASS_FULL_NAME);
     if(klass == nullptr) {
-        crash();
+        dpt_crash();
     }
 }
 
-[[noreturn]] void *detectFridaOnThread(__unused void *args) {
+[[noreturn]] DPT_ENCRYPT void *detectFridaOnThread(__unused void *args) {
     while (true) {
         int frida_so_count = find_in_maps(1,"frida-agent");
         if(frida_so_count > 0) {
             DLOGD("detectFridaOnThread found frida so");
-            crash();
+            dpt_crash();
         }
         int frida_thread_count = find_in_threads_list(4
                 ,"pool-frida"
@@ -46,7 +46,7 @@ void junkCodeDexProtect(JNIEnv *env) {
 
         if(frida_thread_count >= 2) {
             DLOGD("detectFridaOnThread found frida threads");
-            crash();
+            dpt_crash();
         }
         sleep(10);
     }
@@ -58,7 +58,7 @@ DPT_ENCRYPT void detectFrida() {
     pthread_create(&t, nullptr,detectFridaOnThread,nullptr);
 }
 
-void doPtrace() {
+DPT_ENCRYPT void doPtrace() {
     __unused int ret = sys_ptrace(PTRACE_TRACEME,0,0,0);
     DLOGD("doPtrace result: %d",ret);
 }
@@ -73,7 +73,7 @@ DPT_ENCRYPT void *protectProcessOnThread(void *args) {
     int pid = waitpid(child, nullptr, 0);
     if(pid > 0) {
         DLOGW("%s detect child process %d exited", __FUNCTION__, pid);
-        crash();
+        dpt_crash();
     }
     DLOGD("%s waitpid %d end", __FUNCTION__ ,child);
 

diff --git a/shell/src/main/cpp/dpt_risk.h b/shell/src/main/cpp/dpt_risk.h
@@ -21,7 +21,7 @@
 #include "dpt_jni.h"
 #include "linux_syscall_support.h"
 
-void crash();
+void dpt_crash();
 void detectFrida();
 void doPtrace();
 void protectChildProcess(pid_t pid);