Update comment and readme.

cimadai · Jan 3, 2018 · ec563fa · ec563fa
1 parent 813af03
commit ec563fa
Show file tree

Hide file tree

Showing 4 changed files with 402 additions and 26 deletions.
diff --git a/app/src/main/cpp/hooker.c b/app/src/main/cpp/hooker.c
@@ -52,7 +52,7 @@ int unhook_rand() {
  */
 int hook_entry(char *so_file_path) {
     LOGD("Hook success, pid = %d\n", getpid());
-    LOGD("Hello %s\n", so_file_path);
+    LOGD("Injecting %s\n", so_file_path);
     void *hooker = dlopen(so_file_path, RTLD_NOW);
     uint32_t new_rand_pointer = (uint32_t) dlsym(hooker, "new_rand");
     uint32_t *old_rand_pointer = (uint32_t *) dlsym(hooker, "old_rand");

diff --git a/app/src/main/cpp/inline_hook.c b/app/src/main/cpp/inline_hook.c
@@ -350,7 +350,6 @@ static void doInlineHook(struct inlineHookItem *item)
     }
 
     if (TEST_BIT0(item->target_addr)) {
-        LOGD("TEST_BIT0 -> 1\n");
         int i;
 
         i = 0;
@@ -363,13 +362,11 @@ static void doInlineHook(struct inlineHookItem *item)
         ((uint16_t *) CLEAR_BIT0(item->target_addr))[i++] = item->new_addr >> 16;
     }
     else {
-        LOGD("TEST_BIT0 -> 2\n");
         ((uint32_t *) (item->target_addr))[0] = 0xe51ff004;	// LDR PC, [PC, #-4]
         ((uint32_t *) (item->target_addr))[1] = item->new_addr;
     }
 
     int m_ret = mprotect((void *) PAGE_START(CLEAR_BIT0(item->target_addr)), PAGE_SIZE * 2, PROT_READ | PROT_EXEC);
-    LOGD("mprotect result = %d\n", m_ret);
 
     item->status = HOOKED;
 

diff --git a/app/src/main/cpp/process_util.c b/app/src/main/cpp/process_util.c
@@ -101,7 +101,8 @@ void *get_remote_func_address(pid_t target_pid, const char *lib_name, void *loca
     // 対象プロセスにおける対象ライブラリの開始アドレス
     remote_module_base = get_library_address(target_pid, lib_name);
 
-    /*目标进程函数地址= 目标进程lib库地址 + （本进程函数地址 -本进程lib库地址）*/
+    LOGD("Remote base = %x, Local base = %x, Local func addr = %x\n", remote_module_base, local_module_base, local_func_address);
+
     // 対象プロセスにおける対象関数のアドレス =
     //   対象プロセスにおける対象ライブラリの開始アドレス + (自プロセスにおける対象関数のアドレス - 自プロセスにおける対象ライブラリの開始アドレス)
     void *target_address = (void *) ((uint32_t) remote_module_base +