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

Use proper AFL_NYX_AUX_SIZE for nyx_aux_string

Browse Source
This commit is contained in:
Christian Holler (:decoder)
2023-10-20 00:07:35 +02:00
parent 51f6229612
commit bfb841d013
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/forkserver.h
View File

@ -197,6 +197,7 @@ typedef struct afl_forkserver {
u32 nyx_id; /* nyx runner id (0 -> master) */ u32 nyx_id; /* nyx runner id (0 -> master) */
u32 nyx_bind_cpu_id; /* nyx runner cpu id */ u32 nyx_bind_cpu_id; /* nyx runner cpu id */
char *nyx_aux_string; char *nyx_aux_string;
u32 nyx_aux_string_len;
bool nyx_use_tmp_workdir; bool nyx_use_tmp_workdir;
char *nyx_tmp_workdir_path; char *nyx_tmp_workdir_path;
s32 nyx_log_fd; s32 nyx_log_fd;

12
src/afl-forkserver.c
View File

@ -615,8 +615,10 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
if (getenv("AFL_NYX_AUX_SIZE") != NULL) { if (getenv("AFL_NYX_AUX_SIZE") != NULL) {
fsrv->nyx_aux_string_len = atoi(getenv("AFL_NYX_AUX_SIZE"));
if (fsrv->nyx_handlers->nyx_config_set_aux_buffer_size( if (fsrv->nyx_handlers->nyx_config_set_aux_buffer_size(
nyx_config, atoi(getenv("AFL_NYX_AUX_SIZE"))) != 1) { nyx_config, fsrv->nyx_aux_string_len) != 1) {
NYX_PRE_FATAL(fsrv, NYX_PRE_FATAL(fsrv,
"Invalid AFL_NYX_AUX_SIZE value set (must be a multiple " "Invalid AFL_NYX_AUX_SIZE value set (must be a multiple "
@ -624,6 +626,10 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
} }
} else {
fsrv->nyx_aux_string_len = 0x1000;
} }
if (getenv("AFL_NYX_REUSE_SNAPSHOT") != NULL) { if (getenv("AFL_NYX_REUSE_SNAPSHOT") != NULL) {
@ -697,8 +703,8 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
fsrv->nyx_handlers->nyx_option_set_timeout(fsrv->nyx_runner, 2, 0); fsrv->nyx_handlers->nyx_option_set_timeout(fsrv->nyx_runner, 2, 0);
fsrv->nyx_handlers->nyx_option_apply(fsrv->nyx_runner); fsrv->nyx_handlers->nyx_option_apply(fsrv->nyx_runner);
fsrv->nyx_aux_string = malloc(0x1000); fsrv->nyx_aux_string = malloc(fsrv->nyx_aux_string_len);
memset(fsrv->nyx_aux_string, 0, 0x1000); memset(fsrv->nyx_aux_string, 0, fsrv->nyx_aux_string_len);
/* dry run */ /* dry run */
fsrv->nyx_handlers->nyx_set_afl_input(fsrv->nyx_runner, "INIT", 4); fsrv->nyx_handlers->nyx_set_afl_input(fsrv->nyx_runner, "INIT", 4);

2
src/afl-fuzz-bitmap.c
View File

@ -866,7 +866,7 @@ save_if_interesting(afl_state_t *afl, void *mem, u32 len, u8 fault) {
if (unlikely(fd < 0)) { PFATAL("Unable to create '%s'", fn_log); } if (unlikely(fd < 0)) { PFATAL("Unable to create '%s'", fn_log); }
u32 nyx_aux_string_len = afl->fsrv.nyx_handlers->nyx_get_aux_string( u32 nyx_aux_string_len = afl->fsrv.nyx_handlers->nyx_get_aux_string(
afl->fsrv.nyx_runner, afl->fsrv.nyx_aux_string, 0x1000); afl->fsrv.nyx_runner, afl->fsrv.nyx_aux_string, afl->fsrv.nyx_aux_string_len);
ck_write(fd, afl->fsrv.nyx_aux_string, nyx_aux_string_len, fn_log); ck_write(fd, afl->fsrv.nyx_aux_string, nyx_aux_string_len, fn_log);
close(fd); close(fd);