diff options
| author | Abhishek Arya <inferno@chromium.org> | 2021-01-31 09:11:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 09:11:42 -0800 |
| commit | 42018eeb1cf2e1f3cffa15690988e183e73e6ecd (patch) | |
| tree | 1ae4d9115ed4b93519548fe3c7c60a80f8c9c13b /infra/base-images/base-builder | |
| parent | c38c48cb3dd4d1b5b4ef416f74e03adc92144756 (diff) | |
| download | oss-fuzz-42018eeb1cf2e1f3cffa15690988e183e73e6ecd.tar.gz | |
Switch to using afl-clang-fast for afl++. (#5074)
Diffstat (limited to 'infra/base-images/base-builder')
| -rw-r--r-- | infra/base-images/base-builder/Dockerfile | 2 | ||||
| -rwxr-xr-x | infra/base-images/base-builder/compile_afl | 24 |
2 files changed, 7 insertions, 19 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 2874a0e67..073db5827 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -147,8 +147,6 @@ RUN mkdir $PRECOMPILED_DIR WORKDIR $SRC -RUN git clone -b stable https://github.com/google/AFL.git afl - RUN git clone -b stable https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \ cd aflplusplus && \ git checkout 068bef5eab942df0a133c92522f2ab81b28ac636 diff --git a/infra/base-images/base-builder/compile_afl b/infra/base-images/base-builder/compile_afl index feba5a0fc..fa3ee01d4 100755 --- a/infra/base-images/base-builder/compile_afl +++ b/infra/base-images/base-builder/compile_afl @@ -15,20 +15,6 @@ # ################################################################################ -echo "Compiling afl driver to $LIB_FUZZING_ENGINE" - -# afl needs its special coverage flags -export COVERAGE_FLAGS="-fsanitize-coverage=trace-pc-guard" - -mkdir -p $WORK/afl -pushd $WORK/afl > /dev/null -# Add -Wno-pointer-sign to silence warning (AFL is compiled this way). -$CC $CFLAGS -Wno-pointer-sign -c $SRC/afl/llvm_mode/afl-llvm-rt.o.c -$CXX $CXXFLAGS -std=c++11 -O2 -c $SRC/libfuzzer/afl/*.cpp -I$SRC/libfuzzer -ar r $LIB_FUZZING_ENGINE $WORK/afl/*.o -popd > /dev/null -rm -rf $WORK/afl - echo "Compiling afl++" # Build and copy afl++ tools necessary for fuzzing. @@ -40,17 +26,21 @@ INITIAL_CXXFLAGS=$CXXFLAGS INITIAL_CFLAGS=$CFLAGS unset CXXFLAGS unset CFLAGS - make clean AFL_NO_X86=1 PYTHON_INCLUDE=/ make -make -C utils/aflpp_driver - CFLAGS=$INITIAL_CFLAGS CXXFLAGS=$INITIAL_CXXFLAGS +# Build afl++ driver with existing CFLAGS, CXXFLAGS. +make -C utils/aflpp_driver +cp libAFLDriver.a $LIB_FUZZING_ENGINE + # Some important projects include libraries, copy those even when they don't # start with "afl-". Use "sort -u" to avoid a warning about duplicates. ls afl-* *.a *.o *.so | sort -u | xargs cp -t $OUT popd > /dev/null +export CC="$SRC/aflplusplus/afl-clang-fast" +export CXX="$SRC/aflplusplus/afl-clang-fast++" + echo " done." |