diff options
author | Rumata888 <isennovskiy@gmail.com> | 2020-11-12 01:29:17 +0300 |
---|---|---|
committer | Rumata888 <isennovskiy@gmail.com> | 2020-11-12 01:29:17 +0300 |
commit | bb218b330f43fada18b910a7bf2b00c6d1a32b23 (patch) | |
tree | b59576e79087493fc40578959c9e865af51c9b96 /custom_mutators/symcc/symcc.c | |
parent | 20a8a93fd193f7526f5e3d0cd1dfa43df9d2c4f6 (diff) | |
download | afl++-bb218b330f43fada18b910a7bf2b00c6d1a32b23.tar.gz |
Formatted changed/added files
Diffstat (limited to 'custom_mutators/symcc/symcc.c')
-rw-r--r-- | custom_mutators/symcc/symcc.c | 69 |
1 files changed, 42 insertions, 27 deletions
diff --git a/custom_mutators/symcc/symcc.c b/custom_mutators/symcc/symcc.c index ab3d70ca..abb58d5e 100644 --- a/custom_mutators/symcc/symcc.c +++ b/custom_mutators/symcc/symcc.c @@ -98,60 +98,74 @@ void afl_custom_queue_new_entry(my_mutator_t * data, const uint8_t *filename_new_queue, const uint8_t *filename_orig_queue) { - int pipefd[2]; + int pipefd[2]; struct stat st; ACTF("Queueing to symcc: %s", filename_new_queue); u8 *fn = alloc_printf("%s", filename_new_queue); if (!(stat(fn, &st) == 0 && S_ISREG(st.st_mode) && st.st_size)) { - PFATAL("Couldn't find enqueued file: %s",fn); + + PFATAL("Couldn't find enqueued file: %s", fn); + } - - if (afl_struct->fsrv.use_stdin){ - if (pipe(pipefd)==-1) - { - exit(-1); - } + + if (afl_struct->fsrv.use_stdin) { + + if (pipe(pipefd) == -1) { exit(-1); } + } + int pid = fork(); if (pid == -1) return; - - if (pid){ - if (afl_struct->fsrv.use_stdin){ + if (pid) { + + if (afl_struct->fsrv.use_stdin) { close(pipefd[0]); int fd = open(fn, O_RDONLY); - + if (fd >= 0) { - + ssize_t r = read(fd, data->mutator_buf, MAX_FILE); DBG("fn=%s, fd=%d, size=%ld\n", fn, fd, r); if (r <= 0) return; close(fd); - if (r>fcntl(pipefd[1],F_GETPIPE_SZ)) fcntl(pipefd[1],F_SETPIPE_SZ,MAX_FILE); + if (r > fcntl(pipefd[1], F_GETPIPE_SZ)) + fcntl(pipefd[1], F_SETPIPE_SZ, MAX_FILE); ck_write(pipefd[1], data->mutator_buf, r, filename_new_queue); + } else { - PFATAL("Something happened to the enqueued file before sending its contents to symcc binary"); + + PFATAL( + "Something happened to the enqueued file before sending its " + "contents to symcc binary"); + } close(pipefd[1]); ck_free(fn); + } - pid = waitpid(pid,NULL, 0); + + pid = waitpid(pid, NULL, 0); + } if (pid == 0) { - if (afl_struct->fsrv.use_stdin) { - unsetenv("SYMCC_INPUT_FILE"); - close(pipefd[1]); - dup2(pipefd[0],0); - } - else - { + + if (afl_struct->fsrv.use_stdin) { + + unsetenv("SYMCC_INPUT_FILE"); + close(pipefd[1]); + dup2(pipefd[0], 0); + + } else { + setenv("SYMCC_INPUT_FILE", afl_struct->fsrv.out_file, 1); - } - + + } + DBG("exec=%s\n", data->target); close(1); close(2); @@ -208,8 +222,8 @@ size_t afl_custom_fuzz(my_mutator_t *data, uint8_t *buf, size_t buf_size, struct dirent **nl; int32_t i, done = 0, items = scandir(data->out_dir, &nl, NULL, NULL); - ssize_t size = 0; - + ssize_t size = 0; + if (items <= 0) return 0; for (i = 0; i < (u32)items; ++i) { @@ -224,6 +238,7 @@ size_t afl_custom_fuzz(my_mutator_t *data, uint8_t *buf, size_t buf_size, int fd = open(fn, O_RDONLY); if (fd >= 0) { + size = read(fd, data->mutator_buf, max_size); *out_buf = data->mutator_buf; |