ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-17 04:18:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

code-format and slight -S/-M modifications

Browse Source
This commit is contained in:
van Hauser
2020-05-13 16:49:00 +02:00
parent c384a17b41
commit 60a5df5262
7 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/custom_mutators/example.c
View File

@ -139,10 +139,11 @@ size_t afl_custom_fuzz(my_mutator_t *data, uint8_t *buf, size_t buf_size,
* @return Size of the output buffer after processing or the needed amount.
* A return of 0 indicates an error.
*/
size_t afl_custom_post_process(my_mutator_t *data, uint8_t *buf, size_t buf_size,
uint8_t **out_buf) {
size_t afl_custom_post_process(my_mutator_t *data, uint8_t *buf,
size_t buf_size, uint8_t **out_buf) {
uint8_t *post_process_buf = maybe_grow(BUF_PARAMS(data, post_process), buf_size + 5);
uint8_t *post_process_buf =
maybe_grow(BUF_PARAMS(data, post_process), buf_size + 5);
if (!post_process_buf) {
perror("custom mutator realloc failed.");

7
include/afl-fuzz.h
View File

@ -407,7 +407,9 @@ typedef struct afl_state {
no_unlink, /* do not unlink cur_input */
debug, /* Debug mode */
custom_only, /* Custom mutator only mode */
python_only; /* Python-only mode */
python_only, /* Python-only mode */
is_master, /* if this is a master */
is_slave; /* if this is a slave */
u32 stats_update_freq; /* Stats update frequency (execs) */
@ -418,7 +420,6 @@ typedef struct afl_state {
size_t (*radamsa_mutate_ptr)(u8 *, size_t, u8 *, size_t, u32);
u8 skip_deterministic, /* Skip deterministic stages? */
force_deterministic, /* Force deterministic stages? */
use_splicing, /* Recombine input files? */
dumb_mode, /* Run in non-instrumented mode? */
score_changed, /* Scoring for favorites changed? */
@ -547,7 +548,7 @@ typedef struct afl_state {
/* afl_postprocess API - Now supported via custom mutators */
struct custom_mutator * post_library_mutator;
struct custom_mutator *post_library_mutator;
/* CmpLog */

1
src/afl-fuzz-cmplog.c
View File

@ -51,7 +51,6 @@ u8 common_fuzz_cmplog_stuff(afl_state_t *afl, u8 *out_buf, u32 len) {
u8 fault;
write_to_testcase(afl, out_buf, len);
fault = fuzz_run_target(afl, &afl->cmplog_fsrv, afl->fsrv.exec_tmout);

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

@ -297,14 +297,24 @@ void setup_post(afl_state_t *afl) {
dh = dlopen(fn, RTLD_NOW);
if (!dh) { FATAL("%s", dlerror()); }
struct custom_mutator * mutator;
struct custom_mutator *mutator;
mutator = ck_alloc(sizeof(struct custom_mutator));
memset(mutator, 0, sizeof(struct custom_mutator));
mutator->afl_custom_post_process = dlsym(dh, "afl_postprocess");
if (!mutator->afl_custom_post_process) { FATAL("Symbol 'afl_postprocess' not found."); }
if (!mutator->afl_custom_post_process) {
FATAL("Symbol 'afl_postprocess' not found.");
}
mutator->afl_custom_init = dlsym(dh, "afl_postprocess_init");
if (!mutator->afl_custom_init) { FATAL("Symbol 'afl_postprocess_init' not found."); }
if (!mutator->afl_custom_init) {
FATAL("Symbol 'afl_postprocess_init' not found.");
}
mutator->afl_custom_deinit = dlsym(dh, "afl_postprocess_deinit");
if (!mutator->afl_custom_post_process) {
@ -1373,6 +1383,17 @@ void setup_dirs_fds(afl_state_t *afl) {
}
/*
if (afl->is_master) {
u8 *x = alloc_printf("%s/is_master", afl->sync_dir);
int fd = open(x, O_CREAT | O_RDWR, 0644);
if (fd < 0) FATAL("cannot create %s", x);
close(fd);
}
*/
if (mkdir(afl->out_dir, 0700)) {
if (errno != EEXIST) { PFATAL("Unable to create '%s'", afl->out_dir); }
@ -1861,14 +1882,6 @@ void fix_up_sync(afl_state_t *afl) {
if (afl->dumb_mode) { FATAL("-S / -M and -n are mutually exclusive"); }
if (afl->skip_deterministic) {
if (afl->force_deterministic) { FATAL("use -S instead of -M -d"); }
// else
// FATAL("-S already implies -d");
}
while (*x) {
if (!isalnum(*x) && *x != '_' && *x != '-') {
@ -1888,13 +1901,6 @@ void fix_up_sync(afl_state_t *afl) {
afl->sync_dir = afl->out_dir;
afl->out_dir = x;
if (!afl->force_deterministic) {
afl->skip_deterministic = 1;
afl->use_splicing = 1;
}
}
/* Handle screen resize (SIGWINCH). */

3
src/afl-fuzz-mutators.c
View File

@ -108,7 +108,8 @@ void setup_custom_mutators(afl_state_t *afl) {
#endif
if (afl->post_library_mutator) list_append(&afl->custom_mutator_list, afl->post_library_mutator);
if (afl->post_library_mutator)
list_append(&afl->custom_mutator_list, afl->post_library_mutator);
}

9
src/afl-fuzz-python.c
View File

@ -384,7 +384,8 @@ struct custom_mutator *load_custom_mutator_py(afl_state_t *afl,
}
size_t post_process_py(void *py_mutator, u8 *buf, size_t buf_size, u8 **out_buf) {
size_t post_process_py(void *py_mutator, u8 *buf, size_t buf_size,
u8 **out_buf) {
size_t py_out_buf_size;
PyObject * py_args, *py_value;
@ -402,7 +403,8 @@ size_t post_process_py(void *py_mutator, u8 *buf, size_t buf_size, u8 **out_buf)
PyTuple_SetItem(py_args, 0, py_value);
py_value = PyObject_CallObject(
((py_mutator_t *)py_mutator)->py_functions[PY_FUNC_POST_PROCESS], py_args);
((py_mutator_t *)py_mutator)->py_functions[PY_FUNC_POST_PROCESS],
py_args);
Py_DECREF(py_args);
@ -412,7 +414,8 @@ size_t post_process_py(void *py_mutator, u8 *buf, size_t buf_size, u8 **out_buf)
ck_maybe_grow(BUF_PARAMS(post_process), py_out_buf_size);
memcpy(py->post_process_buf, PyByteArray_AsString(py_value), py_out_buf_size);
memcpy(py->post_process_buf, PyByteArray_AsString(py_value),
py_out_buf_size);
Py_DECREF(py_value);
*out_buf = py->post_process_buf;

14
src/afl-fuzz.c
View File

@ -390,7 +390,7 @@ int main(int argc, char **argv_orig, char **envp) {
}
afl->force_deterministic = 1;
afl->is_master = 1;
}
@ -400,6 +400,9 @@ int main(int argc, char **argv_orig, char **envp) {
if (afl->sync_id) { FATAL("Multiple -S or -M options not supported"); }
afl->sync_id = ck_strdup(optarg);
afl->is_slave = 1;
afl->skip_deterministic = 1;
afl->use_splicing = 1;
break;
case 'f': /* target file */
@ -500,12 +503,6 @@ int main(int argc, char **argv_orig, char **envp) {
case 'd': /* skip deterministic */
if (afl->skip_deterministic) {
FATAL("Multiple -d options not supported");
}
afl->skip_deterministic = 1;
afl->use_splicing = 1;
break;
@ -794,8 +791,7 @@ int main(int argc, char **argv_orig, char **envp) {
OKF("afl-tmin fork server patch from github.com/nccgroup/TriforceAFL");
OKF("MOpt Mutator from github.com/puppet-meteor/MOpt-AFL");
if (afl->sync_id && afl->force_deterministic &&
afl->afl_env.afl_custom_mutator_only) {
if (afl->sync_id && afl->is_master && afl->afl_env.afl_custom_mutator_only) {
WARNF(
"Using -M master with the AFL_CUSTOM_MUTATOR_ONLY mutator options will "