ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1753 from WorksButNotTested/delay_start

Browse Source 
Changes to support defered start
This commit is contained in:
van Hauser
2023-06-01 13:12:47 +03:00
committed by GitHub
parent 7870ece6dc 06e1c64745
commit 63a7a816e7
4 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frida_mode/include/entry.h
View File

@ -14,8 +14,6 @@ void entry_init(void);
void entry_start(void); void entry_start(void);
void entry_prologue(GumStalkerIterator *iterator, GumStalkerOutput *output);
void entry_on_fork(void); void entry_on_fork(void);
#endif #endif

26
frida_mode/src/entry.c
View File

@ -78,6 +78,7 @@ void entry_init(void) {
void entry_start(void) { void entry_start(void) {
FVERBOSE("AFL_ENTRYPOINT reached");
if (persistent_start == 0) { if (persistent_start == 0) {
ranges_exclude(); ranges_exclude();
@ -85,32 +86,7 @@ void entry_start(void) {
} }
if (entry_point == 0) { entry_launch(); }
}
static void entry_callout(GumCpuContext *cpu_context, gpointer user_data) {
UNUSED_PARAMETER(cpu_context);
UNUSED_PARAMETER(user_data);
entry_compiled = TRUE;
entry_launch(); entry_launch();
} }
void entry_prologue(GumStalkerIterator *iterator, GumStalkerOutput *output) {
UNUSED_PARAMETER(output);
FVERBOSE("AFL_ENTRYPOINT reached");
if (persistent_start == 0) {
ranges_exclude();
stalker_trust();
}
gum_stalker_iterator_put_callout(iterator, entry_callout, NULL, NULL);
}

1
frida_mode/src/instrument/instrument.c
View File

@ -169,7 +169,6 @@ static void instrument_basic_block(GumStalkerIterator *iterator,
if (unlikely(begin)) { instrument_debug_start(instr->address, output); } if (unlikely(begin)) { instrument_debug_start(instr->address, output); }
if (instr->address == entry_point) { entry_prologue(iterator, output); }
if (instr->address == persistent_start) { persistent_prologue(output); } if (instr->address == persistent_start) { persistent_prologue(output); }
if (instr->address == persistent_ret) { persistent_epilogue(output); } if (instr->address == persistent_ret) { persistent_epilogue(output); }

41
frida_mode/src/main.c
View File

@ -197,7 +197,7 @@ static void afl_print_env(void) {
} }
__attribute__((visibility("default"))) void afl_frida_start(void) { void afl_frida_config(void) {
FOKF(cRED "**********************"); FOKF(cRED "**********************");
FOKF(cRED "* " cYEL "******************" cRED " *"); FOKF(cRED "* " cYEL "******************" cRED " *");
@ -225,9 +225,7 @@ __attribute__((visibility("default"))) void afl_frida_start(void) {
js_start(); js_start();
/* Initialize */
output_init(); output_init();
embedded_init(); embedded_init();
entry_init(); entry_init();
instrument_init(); instrument_init();
@ -240,12 +238,35 @@ __attribute__((visibility("default"))) void afl_frida_start(void) {
ranges_init(); ranges_init();
stats_init(); stats_init();
/* Start */ }
void afl_frida_run(void) {
stalker_start(); stalker_start();
entry_start(); entry_start();
} }
__attribute__((visibility("default"))) void afl_frida_start(void) {
afl_frida_config();
afl_frida_run();
}
typedef void *(*entry_func_t)(size_t a1, size_t a2, size_t a3, size_t a4,
size_t a5, size_t a6);
static void *on_entry(size_t a1, size_t a2, size_t a3, size_t a4, size_t a5,
size_t a6) {
intercept_unhook(GSIZE_TO_POINTER(entry_point));
afl_frida_run();
entry_func_t entry = (entry_func_t)entry_point;
return entry(a1, a2, a3, a4, a5, a6);
}
static int on_main(int argc, char **argv, char **envp) { static int on_main(int argc, char **argv, char **envp) {
int ret; int ret;
@ -254,7 +275,17 @@ static int on_main(int argc, char **argv, char **envp) {
intercept_unhook_self(); intercept_unhook_self();
afl_frida_start(); afl_frida_config();
if (entry_point == 0) {
afl_frida_run();
} else {
intercept_hook(GSIZE_TO_POINTER(entry_point), on_entry, NULL);
}
if (js_main_hook != NULL) { if (js_main_hook != NULL) {