attempt to handle issue: FRIDA mode does NOT support multithreading A…

…FLplusplus#1605
skirge · Mar 15, 2024 · 146a280 · 146a280
1 parent 775861e
commit 146a280
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/frida_mode/include/entry.h b/frida_mode/include/entry.h
@@ -4,6 +4,7 @@
 #include "frida-gumjs.h"
 
 extern guint64 entry_point;
+extern guint64 other_func;
 extern gboolean traceable;
 extern gboolean entry_compiled;
 extern gboolean entry_run;

diff --git a/frida_mode/src/entry.c b/frida_mode/src/entry.c
@@ -18,6 +18,7 @@
 extern void __afl_manual_init();
 
 guint64 entry_point = 0;
+guint64 other_func = 0;
 gboolean traceable = FALSE;
 gboolean entry_compiled = FALSE;
 gboolean entry_run = FALSE;
@@ -63,6 +64,7 @@ void entry_on_fork(void) {
 void entry_config(void) {
 
  entry_point = util_read_address("AFL_ENTRYPOINT", 0);
+ other_func = util_read_address("AFL_OTHER_FUNC", 0);
  if (getenv("AFL_FRIDA_TRACEABLE") != NULL) { traceable = TRUE; }
 
 }

diff --git a/frida_mode/src/main.c b/frida_mode/src/main.c
@@ -267,6 +267,15 @@ static void *on_entry(size_t a1, size_t a2, size_t a3, size_t a4, size_t a5,
 
 }
 
+static void *on_other(size_t a1, size_t a2, size_t a3, size_t a4, size_t a5,
+ size_t a6) {
+
+ intercept_unhook(GSIZE_TO_POINTER(other_func));
+ afl_frida_run();
+ entry_func_t entry = (entry_func_t)other_func;
+ return entry(a1, a2, a3, a4, a5, a6);
+
+}
 static int on_main(int argc, char **argv, char **envp) {
 
  int ret;
@@ -287,6 +296,9 @@ static int on_main(int argc, char **argv, char **envp) {
 
  }
 
+ if(other_func != 0 ) {
+ intercept_hook(GSIZE_TO_POINTER(other_func), on_other, NULL);
+ }
  if (js_main_hook != NULL) {
 
  ret = js_main_hook(argc, argv, envp);