diff options
| author | van Hauser <vh@thc.org> | 2021-03-18 15:49:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 14:49:58 +0000 |
| commit | df6dc548a93042acc7df395100f83d8b0f56d966 (patch) | |
| tree | 03bbc15a15fc1d86e99ef35024645109b4cdf99a /infra | |
| parent | 6f3fc2047ee538e37899273b69afa1b7d10e6477 (diff) | |
| download | oss-fuzz-df6dc548a93042acc7df395100f83d8b0f56d966.tar.gz | |
remove map size for afl++ (#5433)
* output afl++ setup
* update commit id
* update afl++ commit id
* asan + cmplog fix
* update commit id
* update and enhance afl++
* update afl++ commit id, better run asan options
* fix linter
* add debug_afl script
* Update debug_afl
* Update compile_afl
* fix for karchive
* put debug_afl in the docker container
* asan poison fix
* fix asan settings for zeek
* update afl++ commit id
* fix
* update afl++ commit id
* final touches
* remove map size
* remove old comment
Co-authored-by: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/base-images/base-builder/Dockerfile | 2 | ||||
| -rw-r--r-- | infra/base-images/base-builder/compile_afl | 2 | ||||
| -rwxr-xr-x | infra/base-images/base-builder/debug_afl | 1 | ||||
| -rwxr-xr-x | infra/base-images/base-runner/run_fuzzer | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 66253c5c9..682df4652 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -180,7 +180,7 @@ WORKDIR $SRC # TODO: switch to -b stable once we can. RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \ cd aflplusplus && \ - git checkout 7c2436c7114e21f029b06346421a73910deac578 + git checkout 94312796f936ba1830b61432a0f958e192dd212f RUN cd $SRC && \ curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \ diff --git a/infra/base-images/base-builder/compile_afl b/infra/base-images/base-builder/compile_afl index fa2cb5e89..dc6624459 100644 --- a/infra/base-images/base-builder/compile_afl +++ b/infra/base-images/base-builder/compile_afl @@ -40,8 +40,6 @@ export CXX="$SRC/aflplusplus/afl-clang-fast++" # Set sane afl++ environment defaults: # Be quiet, otherwise this can break some builds. export AFL_QUIET=1 -# Several targets run their own tools, so ensure its working. -export AFL_MAP_SIZE=8000000 # No leak errors during builds. export ASAN_OPTIONS="detect_leaks=0:symbolize=0:detect_odr_violation=0:abort_on_error=1" diff --git a/infra/base-images/base-builder/debug_afl b/infra/base-images/base-builder/debug_afl index 1f79746e5..c53dae815 100755 --- a/infra/base-images/base-builder/debug_afl +++ b/infra/base-images/base-builder/debug_afl @@ -33,7 +33,6 @@ export CXXFLAGS="$CXXFLAGS_SAVE" popd > /dev/null export ASAN_OPTIONS="detect_leaks=0:symbolize=0:detect_odr_violation=0:abort_on_error=1" -export AFL_MAP_SIZE=8000000 export AFL_LLVM_LAF_ALL=1 export AFL_LLVM_CMPLOG=1 touch "$OUT/afl_cmplog.txt" diff --git a/infra/base-images/base-runner/run_fuzzer b/infra/base-images/base-runner/run_fuzzer index 16ca244ae..b9bc8d9d6 100755 --- a/infra/base-images/base-runner/run_fuzzer +++ b/infra/base-images/base-runner/run_fuzzer @@ -105,7 +105,6 @@ if [[ "$FUZZING_ENGINE" = afl ]]; then export AFL_SKIP_CPUFREQ=1 export AFL_NO_AFFINITY=1 export AFL_FAST_CAL=1 - export AFL_MAP_SIZE=4194304 # If $OUT/afl_cmplog.txt is present this means the target was compiled for # CMPLOG. So we have to add the proper parameters to afl-fuzz. `-l 2` is # CMPLOG level 2, which will colorize larger files but not huge files and |