修改提供给用户使用的接口

Author: AndroidReverser-Test

README.md

@@ -11,7 +11,7 @@
 
 **set_target_file**函数用于设置要hook so的路径(必须是完整路径)。
 
-**set_fun_info**函数用于在so文件的指定偏移处设置uprobe挂载点，并可传递指定函数名。
+**set_fun_info**函数第一个参数是要设置函数的uprobe偏移，计算方法见文末，第二个参数为函数偏移，第三个参数为自定义函数名。
 
 **clear_all_uprobes**函数用于清除所有的uprobe挂载点。
 

kernel_trace.c

@@ -14,7 +14,7 @@
 #include "kernel_trace.h"
 
 KPM_NAME("kernel_trace");
-KPM_VERSION("2.2.0");
+KPM_VERSION("2.3.0");
 KPM_LICENSE("GPL v2");
 KPM_AUTHOR("Test");
 KPM_DESCRIPTION("use uprobe trace some fun in kpm");
@@ -85,15 +85,21 @@ void before_mincore(hook_fargs3_t *args, void *udata){
             logke("+Test-Log+ same fun 0x%llx set uprobe\n",fun_offset);
             goto error_out;
         }
-//        logkd("+Test-Log+ fun_name:%s,fun_offset:0x%llx\n",fun_name,fun_offset);
-        int hret = uprobe_register(inode,fun_offset,&trace_uc);
+        logkd("+Test-Log+ fun_name:%s,fun_offset:%llx\n",fun_name,fun_offset);
+        goto success_out;
+    }
+
+    if(trace_info==SET_TARGET_UPROBE){
+        unsigned long rfun_offset = (unsigned long)syscall_argn(args, 0);
+        int hret = uprobe_register(inode,rfun_offset,&trace_uc);
         if(hret<0){
-            logke("+Test-Log+ set uprobe error in 0x%llx\n",fun_offset);
+            logke("+Test-Log+ set uprobe error in 0x%llx\n",rfun_offset);
             goto error_out;
         }
 
-        fun_offsets[hook_num] = fun_offset;
+        fun_offsets[hook_num] = rfun_offset;
         hook_num++;
+        logkd("+Test-Log+ rfun_offset:%llx\n",rfun_offset);
         goto success_out;
     }
 
@@ -157,13 +163,8 @@ static int trace_handler(struct uprobe_consumer *self, struct mpt_regs *regs){
     if(uid==target_uid){
         fun_offset = regs->pc-module_base;
         tfun = search_key_value(&fun_info_tree,fun_offset);
-        if(tfun){
+        if(likely(tfun)){
             goto target_out;
-        }else{
-            tfun = search_key_value(&fun_info_tree,fun_offset- 0x1000);
-            if(likely(tfun)){
-                goto target_out;
-            }
         }
     }else{
         goto no_target_out;

uprobe_trace.h

@@ -7,6 +7,7 @@ enum trace_info {
     SET_TARGET_FILE,
     SET_MODULE_BASE,
     SET_FUN_INFO,
+    SET_TARGET_UPROBE,
     SET_TARGET_UID,
     CLEAR_UPROBE,
 };

user/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(){