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

refactored global lists

Browse Source
This commit is contained in:
Dominik Maier
2020-04-26 02:32:09 +02:00
parent 85627516a4
commit 66eee34709
6 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/afl-fuzz.h
View File

@ -614,11 +614,6 @@ typedef struct afl_state {
} afl_state_t; } afl_state_t;
/* A global pointer to all instances is needed (for now) for signals to arrive
*/
extern list_t afl_states;
struct custom_mutator { struct custom_mutator {
const char *name; const char *name;
@ -800,6 +795,14 @@ struct custom_mutator {
void afl_state_init(afl_state_t *, uint32_t map_size); void afl_state_init(afl_state_t *, uint32_t map_size);
void afl_state_deinit(afl_state_t *); void afl_state_deinit(afl_state_t *);
/* Set stop_soon flag on all childs, kill all childs */
void afl_states_stop(void);
/* Set clear_screen flag on all states */
void afl_states_clear_screen(void);
/* Sets the skip flag on all states */
void afl_states_request_skip(void);
void read_afl_environment(afl_state_t *, char **); void read_afl_environment(afl_state_t *, char **);
/**** Prototypes ****/ /**** Prototypes ****/

2
include/common.h
View File

@ -115,7 +115,7 @@ u8 *u_stringify_time_diff(u8 *buf, u64 cur_ms, u64 event_ms);
u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms, u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
volatile u8 *stop_soon_p); volatile u8 *stop_soon_p);
u32 get_map_size(); u32 get_map_size(void);
#endif #endif

2
src/afl-common.c
View File

@ -918,7 +918,7 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
} }
u32 get_map_size() { u32 get_map_size(void) {
uint32_t map_size = MAP_SIZE; uint32_t map_size = MAP_SIZE;
char * ptr; char * ptr;

13
src/afl-fuzz-init.c
View File

@ -1903,7 +1903,7 @@ void fix_up_sync(afl_state_t *afl) {
static void handle_resize(int sig) { static void handle_resize(int sig) {
LIST_FOREACH(&afl_states, afl_state_t, { el->clear_screen = 1; }); afl_states_clear_screen();
} }
@ -1954,14 +1954,7 @@ void check_asan_opts(void) {
static void handle_stop_sig(int sig) { static void handle_stop_sig(int sig) {
LIST_FOREACH(&afl_states, afl_state_t, { afl_states_stop();
el->stop_soon = 1;
if (el->fsrv.child_pid > 0) kill(el->fsrv.child_pid, SIGKILL);
if (el->fsrv.fsrv_pid > 0) kill(el->fsrv.fsrv_pid, SIGKILL);
});
} }
@ -1969,7 +1962,7 @@ static void handle_stop_sig(int sig) {
static void handle_skipreq(int sig) { static void handle_skipreq(int sig) {
LIST_FOREACH(&afl_states, afl_state_t, { el->skip_requested = 1; }); afl_states_request_skip();
} }

33
src/afl-fuzz-state.c
View File

@ -71,7 +71,7 @@ static void init_mopt_globals(afl_state_t *afl) {
/* A global pointer to all instances is needed (for now) for signals to arrive /* A global pointer to all instances is needed (for now) for signals to arrive
*/ */
list_t afl_states = {.element_prealloc_count = 0}; static list_t afl_states = {.element_prealloc_count = 0};
/* Initializes an afl_state_t. */ /* Initializes an afl_state_t. */
@ -398,3 +398,34 @@ void afl_state_deinit(afl_state_t *afl) {
} }
void afl_states_stop(void) {
/* We may be inside a signal handler.
Set flags first, send kill signals to child proceses later. */
LIST_FOREACH(&afl_states, afl_state_t, {
el->stop_soon = 1;
});
LIST_FOREACH(&afl_states, afl_state_t, {
if (el->fsrv.child_pid > 0) kill(el->fsrv.child_pid, SIGKILL);
if (el->fsrv.fsrv_pid > 0) kill(el->fsrv.fsrv_pid, SIGKILL);
});
}
void afl_states_clear_screen(void) {
LIST_FOREACH(&afl_states, afl_state_t, { el->clear_screen = 1; });
}
void afl_states_request_skip(void) {
LIST_FOREACH(&afl_states, afl_state_t, { el->skip_requested = 1; });
}

2
test/unittests/unit_list.c
View File

@ -40,7 +40,7 @@ int __wrap_printf(const char *format, ...) {
return 1; return 1;
} }
list_t testlist; static list_t testlist = {.element_prealloc_count = 0};
static void test_contains(void **state) { static void test_contains(void **state) {