Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes afl++ installation (#5087) 

* fix afl++ installation

* update to experimental afl++ checkout, setting afl-clang-fast

* update afl++ commit id to prevent unnecessary compile warnings

* Remove dictionary links addition.

Co-authored-by: Abhishek Arya <inferno@chromium.org>
This commit is contained in:
van Hauser 2021-02-02 01:20:18 +01:00 committed by GitHub
parent 95d3905ec9
commit 05cac485d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/base-images/base-builder/Dockerfile
View File

@ -151,7 +151,7 @@ RUN git clone -b stable https://github.com/google/AFL.git afl
RUN git clone -b stable https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \ RUN git clone -b stable https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
cd aflplusplus && \ cd aflplusplus && \
git checkout 068bef5eab942df0a133c92522f2ab81b28ac636 git checkout 654f389e73c9fd5b7e141b33ea28ab0fdda3178f
RUN cd $SRC && \ RUN cd $SRC && \
curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \ curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \

31
infra/base-images/base-builder/compile_afl Executable file → Normal file
View File

@ -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++" echo "Compiling afl++"
# Build and copy afl++ tools necessary for fuzzing. # Build and copy afl++ tools necessary for fuzzing.
@ -40,17 +26,24 @@ INITIAL_CXXFLAGS=$CXXFLAGS
INITIAL_CFLAGS=$CFLAGS INITIAL_CFLAGS=$CFLAGS
unset CXXFLAGS unset CXXFLAGS
unset CFLAGS unset CFLAGS
make clean make clean
AFL_NO_X86=1 PYTHON_INCLUDE=/ make AFL_NO_X86=1 PYTHON_INCLUDE=/ make
make -C utils/aflpp_driver # ensure no coverage or fuzzer sanitizers are set
CFLAGS=$(echo " $INITIAL_CFLAGS"|sed 's/-fsanitize=fuzz[a-z-]*//'|sed 's/-fsanitize-coverage=[a-z-]*//')
CXXFLAGS=$(echo " $INITIAL_CXXFLAGS"|sed 's/-fsanitize=fuzz[a-z-]*//'|sed 's/-fsanitize-coverage=[a-z-]*//')
export CFLAGS
export CXXFLAGS
CFLAGS=$INITIAL_CFLAGS # Build afl++ driver with existing CFLAGS, CXXFLAGS.
CXXFLAGS=$INITIAL_CXXFLAGS make -C utils/aflpp_driver
cp libAFLDriver.a $LIB_FUZZING_ENGINE
# Some important projects include libraries, copy those even when they don't # Some important projects include libraries, copy those even when they don't
# start with "afl-". Use "sort -u" to avoid a warning about duplicates. # start with "afl-". Use "sort -u" to avoid a warning about duplicates.
ls afl-* *.a *.o *.so | sort -u | xargs cp -t $OUT ls afl-* *.txt *.a *.o *.so | sort -u | xargs cp -t $OUT
popd > /dev/null popd > /dev/null
export CC="$SRC/aflplusplus/afl-clang-fast"
export CXX="$SRC/aflplusplus/afl-clang-fast++"
echo " done." echo " done."