修复bug

Author: AndroidReverser-Test

app/src/main/cpp/il2cpp_trace.cpp

@@ -21,6 +21,10 @@ char module_path[PATH_MAX];
 static uint64_t il2cpp_base = 0;
 int hook_fun_num=0;
 std::map<long,std::string> fun_name_dict;
+unsigned long start_addrs[MAX_VMA_NUM];
+unsigned long end_addrs[MAX_VMA_NUM];
+unsigned long vma_base[MAX_VMA_NUM];
+int vma_num=0;
 
 void init_il2cpp_api(void *handle) {
 #define DO_API(r, n, p) {                      \
@@ -110,9 +114,16 @@ void hook_all_fun(){
     for (auto it = fun_name_dict.begin(); it != fun_name_dict.end(); ++it) {
         unsigned long fun_offset = it->first;
         std::string fun_name = it->second;
-        int set_uprobe_ret = set_fun_info(fun_offset,(char*)fun_name.c_str());
+        unsigned long fun_addr = il2cpp_base+fun_offset;
+        unsigned long uprobe_offset;
+        for (int i=0;i<vma_num;i++){
+            if(fun_addr>start_addrs[i] && fun_addr<end_addrs[i]){
+                uprobe_offset = fun_addr-start_addrs[i]+vma_base[i];
+            }
+        }
+        int set_uprobe_ret = set_fun_info(uprobe_offset,fun_offset,(char*)fun_name.c_str());
         if(set_uprobe_ret!=SET_TRACE_SUCCESS){
-            LOGE("set uprobe in fun_name:%s,fun_offset:0x%llx",fun_name.c_str(),fun_offset);
+            LOGE("error set uprobe in fun_name:%s,fun_offset:0x%llx,uprobe_offset:%llx",fun_name.c_str(),fun_offset,uprobe_offset);
         }
     }
     LOGD("success hook fun num:%d",hook_fun_num);
@@ -154,6 +165,40 @@ void trace_type_info(Il2CppMetadataType type_info,char *clazzName) {
     check_all_methods(klass,clazzName);
 }
 
+bool init_vma(){
+    FILE *f;
+    char buf[256];
+    f = fopen("/proc/self/maps","r");
+    if(!f){
+        return false;
+    }
+    while (fgets(buf,256,f)!=NULL){
+        unsigned long tstart,tend,tbase;
+        char permissions[5];
+        int major,minor;
+        unsigned long inode;
+        char path[256];
+
+        int fields = sscanf(buf,"%lx-%lx %4s %lx %x:%x %lu %s",&tstart,&tend,permissions,&tbase,&major,&minor,&inode,path);
+        if(fields==8){
+            if(strcmp(path,module_path)==0){
+//                LOGD("start:%lx,end:%lx,permissions:%s,tbase:%lx\n",tstart,tend,permissions,tbase);
+                if(permissions[2]=='x'){
+                    start_addrs[vma_num] = tstart;
+                    end_addrs[vma_num] = tend;
+                    vma_base[vma_num] = tbase;
+                    vma_num++;
+                }
+            }
+        }
+
+    }
+    fclose(f);
+    if(vma_num==0){
+        return false;
+    }
+    return true;
+}
 
 void start_trace(char* data_dir_path){
     char trace_file_path[PATH_MAX];
@@ -164,6 +209,12 @@ void start_trace(char* data_dir_path){
         return;
     }
     LOGD("success get il2cpp api fun");
+    bool parse_ret = init_vma();
+    if(!parse_ret){
+        LOGE("can not get vma info");
+        return;
+    }
+
 
     int set_module_base_ret = set_module_base(il2cpp_base);
     int set_target_file_ret = set_target_file(module_path);

app/src/main/cpp/il2cpp_trace.h

@@ -4,6 +4,7 @@
 #include <stdint.h>
 
 #define MAX_FULL_NAME_LEN 200
+#define MAX_VMA_NUM 10
 
 struct Il2CppMetadataField
 {

app/src/main/cpp/uprobe_trace_user.h

@@ -11,6 +11,7 @@ enum trace_info {
     SET_TARGET_FILE,
     SET_MODULE_BASE,
     SET_FUN_INFO,
+    SET_TARGET_UPROBE,
     SET_TARGET_UID,
     CLEAR_UPROBE,
 };
@@ -32,9 +33,13 @@ int set_target_file(char* file_name){
     return ret;
 }
 
-int set_fun_info(unsigned long fun_offset,char *fun_name){
-    int ret = syscall(__NR_mincore,fun_offset,TRACE_FLAG+SET_FUN_INFO,fun_name);
-    return ret;
+int set_fun_info(unsigned long uprobe_offset,unsigned long fun_offset,char *fun_name){
+    int insert_key_ret = syscall(__NR_mincore,fun_offset,TRACE_FLAG+SET_FUN_INFO,fun_name);
+    if(insert_key_ret==SET_TRACE_SUCCESS){
+        int ret = syscall(__NR_mincore,uprobe_offset,TRACE_FLAG+SET_TARGET_UPROBE,"");
+        return ret;
+    }
+    return SET_TRACE_ERROR;
 }
 
 int clear_all_uprobes(){