From 5b70d23211ddeddfb4d1dfce29a50234d08e9502 Mon Sep 17 00:00:00 2001 From: van Hauser Date: Fri, 17 Apr 2020 09:10:49 +0200 Subject: added AFL_MAP_SIZE (wip) --- include/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index f0274fd3..fae97a42 100644 --- a/include/config.h +++ b/include/config.h @@ -407,8 +407,7 @@ #define FS_OPT_SNAPSHOT 0x20000000 #define FS_OPT_AUTODICT 0x10000000 #define FS_OPT_GET_MAPSIZE(x) (((x & 0x00fffffe) >> 1) + 1) -#define FS_OPT_SET_MAPSIZE(x) \ - (x <= 1 || x > MAP_SIZE || x > 0x1000000 ? 0 : ((x - 1) << 1)) +#define FS_OPT_SET_MAPSIZE(x) (x <= 1 || x > 0x1000000 ? 0 : ((x - 1) << 1)) #endif /* ! _HAVE_CONFIG_H */ -- cgit 1.4.1 From 6ee11c2a6f96c083f78bce650fbae5730c8ef971 Mon Sep 17 00:00:00 2001 From: van Hauser Date: Fri, 17 Apr 2020 14:08:40 +0200 Subject: little more speed for queue analysis --- README.md | 4 ++-- include/afl-fuzz.h | 5 +++-- include/config.h | 2 +- src/afl-fuzz-queue.c | 4 +--- src/afl-fuzz-state.c | 3 +++ 5 files changed, 10 insertions(+), 8 deletions(-) (limited to 'include/config.h') diff --git a/README.md b/README.md index a6afe73a..1e9b61f1 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ ![Travis State](https://api.travis-ci.com/AFLplusplus/AFLplusplus.svg?branch=master) - Release Version: [2.63c](https://github.com/AFLplusplus/AFLplusplus/releases) + Release Version: [2.64c](https://github.com/AFLplusplus/AFLplusplus/releases) - Github Version: 2.63d + Github Version: 2.64d includes all necessary/interesting changes from Google's afl 2.56b diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index fbf3aa2d..fdfe3789 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -608,9 +608,10 @@ typedef struct afl_state { u8 * ex_buf; size_t ex_size; + /* this is a fixed buffer of size map_size that can be used by any function if they do not call another function */ u8 * map_tmp_buf; - size_t map_tmp_size; - + size_t map_tmp_len; + } afl_state_t; /* A global pointer to all instances is needed (for now) for signals to arrive diff --git a/include/config.h b/include/config.h index fae97a42..1de9973b 100644 --- a/include/config.h +++ b/include/config.h @@ -28,7 +28,7 @@ /* Version string: */ // c = release, d = volatile github dev, e = experimental branch -#define VERSION "++2.63d" +#define VERSION "++2.64c" /****************************************************** * * diff --git a/src/afl-fuzz-queue.c b/src/afl-fuzz-queue.c index 96711cbc..121eb3f1 100644 --- a/src/afl-fuzz-queue.c +++ b/src/afl-fuzz-queue.c @@ -271,12 +271,10 @@ void cull_queue(afl_state_t *afl) { struct queue_entry *q; u32 len = (afl->fsrv.map_size >> 3); u32 i; - u8 * temp_v; + u8 * temp_v = afl->map_tmp_buf; if (afl->dumb_mode || !afl->score_changed) return; - temp_v = ck_maybe_grow((void **)&afl->map_tmp_buf, &afl->map_tmp_size, afl->fsrv.map_size >> 3); - afl->score_changed = 0; memset(temp_v, 255, len); diff --git a/src/afl-fuzz-state.c b/src/afl-fuzz-state.c index 72bdd91e..0904604c 100644 --- a/src/afl-fuzz-state.c +++ b/src/afl-fuzz-state.c @@ -107,6 +107,8 @@ void afl_state_init(afl_state_t *afl, uint32_t map_size) { afl->clean_trace = ck_alloc(map_size); afl->clean_trace_custom = ck_alloc(map_size); afl->first_trace = ck_alloc(map_size); + afl->map_tmp_buf = ck_alloc(map_size); + afl->map_tmp_len = map_size; afl->fsrv.use_stdin = 1; afl->fsrv.map_size = map_size; @@ -389,6 +391,7 @@ void afl_state_deinit(afl_state_t *afl) { ck_free(afl->clean_trace); ck_free(afl->clean_trace_custom); ck_free(afl->first_trace); + ck_free(afl->map_tmp_buf); list_remove(&afl_states, afl); -- cgit 1.4.1 From 9adcc73d617f22ffdfaba0491374dc0b7edcf8cd Mon Sep 17 00:00:00 2001 From: van Hauser Date: Fri, 17 Apr 2020 19:39:32 +0200 Subject: v2.64d init --- docs/Changelog.md | 5 +++++ include/config.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include/config.h') diff --git a/docs/Changelog.md b/docs/Changelog.md index 9d6b5f87..256c9c93 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -9,6 +9,11 @@ Want to stay in the loop on major new features? Join our mailing list by sending a mail to . +### Version ++2.64d (develop): + - ... + + + ### Version ++2.64c (release): - llvm_mode LTO mode: - now requires llvm11 - but compiles all targets! :) diff --git a/include/config.h b/include/config.h index 1de9973b..f11ac919 100644 --- a/include/config.h +++ b/include/config.h @@ -28,7 +28,7 @@ /* Version string: */ // c = release, d = volatile github dev, e = experimental branch -#define VERSION "++2.64c" +#define VERSION "++2.64d" /****************************************************** * * -- cgit 1.4.1