[bug-fix] fix linux compile error

jmpews · Dec 17, 2020 · 0aec6c1 · 0aec6c1
1 parent e7dd908
commit 0aec6c1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 44 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -296,7 +296,6 @@ if(Plugin.SymbolResolver)
   if(SYSTEM.Linux OR SYSTEM.Android)
     set(dobby.plugin.SOURCE_FILE_LIST ${dobby.plugin.SOURCE_FILE_LIST}
       builtin-plugin/SymbolResolver/elf/dobby_symbol_resolver.cc
-      builtin-plugin/AndroidRestriction/android_restriction.cc
     )
   endif()
 endif()
@@ -408,6 +407,10 @@ if(SYSTEM.Android)
   target_link_libraries(dobby log)
 endif()
 
+if(SYSTEM.Linux)
+  target_link_libraries(dobby dl)
+endif()
+
 if(SYSTEM.Darwin)
   target_link_libraries(${dobby_output_name}
     "-framework Foundation")

diff --git a/builtin-plugin/ApplicationEventMonitor/posix_file_descriptor_operation_monitor.cc b/builtin-plugin/ApplicationEventMonitor/posix_file_descriptor_operation_monitor.cc
@@ -21,7 +21,7 @@
 
 #define LOG_TAG "PosixFileOperationMonitor"
 
-std::unordered_map<int, const char *> posix_file_descriptors;
+std::unordered_map<int, const char *> *posix_file_descriptors;
 
 int (*orig_open)(const char *pathname, int flags, ...);
 int fake_open(const char *pathname, int flags, ...) {
@@ -39,7 +39,11 @@ int fake_open(const char *pathname, int flags, ...) {
     // FIXME: strncpy
     strcpy(traced_filename, pathname);
     LOG(1, "[-] trace open handle: %s", pathname);
-    posix_file_descriptors.insert(std::make_pair(result, (const char *)traced_filename));
+
+    if (posix_file_descriptors == NULL) {
+      posix_file_descriptors = new std::unordered_map<int, const char *>();
+    }
+    posix_file_descriptors->insert(std::make_pair(result, (const char *)traced_filename));
   }
   return result;
 }
@@ -55,17 +59,20 @@ int fake___open(const char *pathname, int flags, int mode) {
   }
   int result = orig___open(pathname, flags, mode);
   if (result != -1) {
-    posix_file_descriptors.insert(std::make_pair(result, (const char *)traced_filename));
+    if (posix_file_descriptors == NULL) {
+      posix_file_descriptors = new std::unordered_map<int, const char *>();
+    }
+    posix_file_descriptors->insert(std::make_pair(result, (const char *)traced_filename));
   }
   return result;
 }
 
 static const char *get_traced_filename(int fd, bool removed) {
   std::unordered_map<int, const char *>::iterator it;
-  it = posix_file_descriptors.find(fd);
-  if (it != posix_file_descriptors.end()) {
+  it = posix_file_descriptors->find(fd);
+  if (it != posix_file_descriptors->end()) {
     if (removed)
-      posix_file_descriptors.erase(it);
+      posix_file_descriptors->erase(it);
     return it->second;
   }
   return NULL;
@@ -98,7 +105,7 @@ int fake_close(int fd) {
   return orig_close(fd);
 }
 
-#if 0
+#if 1
 __attribute__((constructor)) static void ctor() {
   DobbyHook((void *)DobbySymbolResolver(NULL, "open"), (void *)fake_open, (void **)&orig_open);
 

diff --git a/builtin-plugin/SymbolResolver/elf/dobby_symbol_resolver.cc b/builtin-plugin/SymbolResolver/elf/dobby_symbol_resolver.cc
@@ -2,15 +2,16 @@
 #include "common/headers/common_header.h"
 
 #include <elf.h>
-#include <jni.h>
-#include <string>
 #include <dlfcn.h>
 #include <link.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <string>
+#include <string.h>
+
 #include "PlatformUtil/ProcessRuntimeUtility.h"
 
 #include <vector>
@@ -171,6 +172,9 @@ PUBLIC void *DobbySymbolResolver(const char *image_name, const char *symbol_name
     }
   }
 #endif
+  result = dlsym(RTLD_DEFAULT, symbol_name_pattern);
+  if(result)
+    return result;
 
   result = resolve_elf_internal_symbol(image_name, symbol_name_pattern);
   return result;

diff --git a/example/CMakelists.txt b/example/CMakelists.txt
diff --git a/source/UserMode/PlatformUtil/Linux/ProcesssRuntimeUtility.cc b/source/UserMode/PlatformUtil/Linux/ProcesssRuntimeUtility.cc
@@ -1,12 +1,13 @@
 #include "PlatformUtil/ProcessRuntimeUtility.h"
 
 #include <elf.h>
-#include <jni.h>
-#include <string>
 #include <dlfcn.h>
 #include <link.h>
 #include <sys/mman.h>
 
+#include <string>
+#include <string.h>
+
 #include <vector>
 
 #define LINE_MAX 2048
@@ -174,13 +175,13 @@ static std::vector<RuntimeModule> get_process_map_with_proc_maps() {
   return ProcessModuleMap;
 }
 
-#if defined(__ANDROID__) && defined(__LP64__)
+#if defined(__LP64__)
 static std::vector<RuntimeModule> get_process_map_with_linker_iterator() {
   std::vector<RuntimeModule> ProcessModuleMap;
 
-  static int (*dl_iterate_phdr_ptr)(int (*)(struct dl_phdr_info*, size_t, void*), void*);
+  static int (*dl_iterate_phdr_ptr)(int (*)(struct dl_phdr_info *, size_t, void *), void *);
   dl_iterate_phdr_ptr = (typeof(dl_iterate_phdr_ptr))dlsym(RTLD_DEFAULT, "dl_iterate_phdr");
-  if(dl_iterate_phdr_ptr == NULL) {
+  if (dl_iterate_phdr_ptr == NULL) {
     return ProcessModuleMap;
   }
 
@@ -203,7 +204,8 @@ static std::vector<RuntimeModule> get_process_map_with_linker_iterator() {
 #endif
 
 std::vector<RuntimeModule> ProcessRuntimeUtility::GetProcessModuleMap() {
-#if defined(__LP64__)
+#if defined(__LP64__) && 0
+  // TODO: won't resolve main binary
   return get_process_map_with_linker_iterator();
 #else
   return get_process_map_with_proc_maps();

diff --git a/source/UserMode/Thread/platform-thread-posix.cc b/source/UserMode/Thread/platform-thread-posix.cc
@@ -1,8 +1,8 @@
-#include "PlatformThread.h"
-
-#include <unistd.h> // getpid
+#include "Thread/PlatformThread.h"
 
+#include <unistd.h>  // getpid
 #include <pthread.h> // pthread
+#include <sys/syscall.h>
 
 using namespace zz;