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

fix AFL_CMIN_CRASHES_ONLY=1 afl-showmap

Browse Source
This commit is contained in:
hexcoder-
2020-10-17 14:34:14 +02:00
parent fcea01a8ea
commit d8a058bf59
2 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
afl-cmin
View File

@ -409,8 +409,8 @@ BEGIN {
retval = system( AFL_CMIN_CRASHES_ONLY"\""showmap"\" -m "mem_limit" -t "timeout" -o \""trace_dir"\" -Z "extra_par" -i \""in_dir"\" -- \""target_bin"\" "prog_args_string" </dev/null") retval = system( AFL_CMIN_CRASHES_ONLY"\""showmap"\" -m "mem_limit" -t "timeout" -o \""trace_dir"\" -Z "extra_par" -i \""in_dir"\" -- \""target_bin"\" "prog_args_string" </dev/null")
} }
if (retval) { if (retval && !AFL_CMIN_CRASHES_ONLY) {
print "[!]Exit code != 0 received from afl-showmap, terminating..." print "[!] Exit code "retval" != 0 received from afl-showmap, terminating..."
if (!ENVIRON["AFL_KEEP_TRACES"]) { if (!ENVIRON["AFL_KEEP_TRACES"]) {
system("rm -rf "trace_dir" 2>/dev/null") system("rm -rf "trace_dir" 2>/dev/null")

52
src/afl-showmap.c
View File

@ -209,6 +209,13 @@ static u32 write_results_to_file(afl_forkserver_t *fsrv, u8 *outfile) {
if (!outfile) { FATAL("Output filename not set (Bug in AFL++?)"); } if (!outfile) { FATAL("Output filename not set (Bug in AFL++?)"); }
if (cmin_mode && (fsrv->last_run_timed_out
|| (!caa && child_crashed != cco))) {
return ret;
}
if (!strncmp(outfile, "/dev/", 5)) { if (!strncmp(outfile, "/dev/", 5)) {
fd = open(outfile, O_WRONLY); fd = open(outfile, O_WRONLY);
@ -255,9 +262,6 @@ static u32 write_results_to_file(afl_forkserver_t *fsrv, u8 *outfile) {
if (cmin_mode) { if (cmin_mode) {
if (fsrv->last_run_timed_out) { break; }
if (!caa && child_crashed != cco) { break; }
fprintf(f, "%u%u\n", fsrv->trace_bits[i], i); fprintf(f, "%u%u\n", fsrv->trace_bits[i], i);
} else { } else {
@ -292,6 +296,37 @@ static void showmap_run_target_forkserver(afl_forkserver_t *fsrv, u8 *mem,
classify_counts(fsrv); classify_counts(fsrv);
if (!quiet_mode) { SAYF(cRST "-- Program output ends --\n"); }
if (!fsrv->last_run_timed_out && !stop_soon && WIFSIGNALED(fsrv->child_status)) {
child_crashed = 1;
} else {
child_crashed = 0;
}
if (!quiet_mode) {
if (fsrv->last_run_timed_out) {
SAYF(cLRD "\n+++ Program timed off +++\n" cRST);
} else if (stop_soon) {
SAYF(cLRD "\n+++ Program aborted by user +++\n" cRST);
} else if (child_crashed) {
SAYF(cLRD "\n+++ Program killed by signal %u +++\n" cRST,
WTERMSIG(fsrv->child_status));
}
}
if (stop_soon) { if (stop_soon) {
SAYF(cRST cLRD "\n+++ afl-showmap folder mode aborted by user +++\n" cRST); SAYF(cRST cLRD "\n+++ afl-showmap folder mode aborted by user +++\n" cRST);
@ -1156,8 +1191,17 @@ int main(int argc, char **argv_orig, char **envp) {
afl_shm_deinit(&shm); afl_shm_deinit(&shm);
if (fsrv->use_shmem_fuzz) shm_fuzz = deinit_shmem(fsrv, shm_fuzz); if (fsrv->use_shmem_fuzz) shm_fuzz = deinit_shmem(fsrv, shm_fuzz);
u32 ret = child_crashed * 2 + fsrv->last_run_timed_out; u32 ret;
if (cmin_mode && !!getenv("AFL_CMIN_CRASHES_ONLY")) {
ret = fsrv->last_run_timed_out;
} else {
ret = child_crashed * 2 + fsrv->last_run_timed_out;
}
if (fsrv->target_path) { ck_free(fsrv->target_path); } if (fsrv->target_path) { ck_free(fsrv->target_path); }
afl_fsrv_deinit(fsrv); afl_fsrv_deinit(fsrv);