diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-08-05 10:28:00 +0200 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-08-05 10:28:00 +0200 |
| commit | 9864d9c189ee7f744b4fb791a035980c710974d1 (patch) | |
| tree | 12fc9014ef20678f6e7db06ff3e3286648142c3f | |
| parent | bd36aac60a6d85fe83d072bf00a9ec0b2f3f135d (diff) | |
| parent | 4a859aff70cb4334c78bd6a13feb820bdad9d9d6 (diff) | |
| download | afl++-9864d9c189ee7f744b4fb791a035980c710974d1.tar.gz | |
Merge branch 'dev' of github.com:vanhauser-thc/AFLplusplus into dev
| -rw-r--r-- | GNUmakefile | 6 | ||||
| -rw-r--r-- | llvm_mode/afl-llvm-common.cc | 2 | ||||
| -rwxr-xr-x | test/test-llvm.sh | 2 | ||||
| -rw-r--r-- | test/travis/bionic/Dockerfile | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 510f4298..679ccc82 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -551,9 +551,9 @@ source-only: all -$(MAKE) -C gcc_plugin $(MAKE) -C libdislocator $(MAKE) -C libtokencap - #$(MAKE) -C examples/afl_network_proxy - #$(MAKE) -C examples/socket_fuzzing - #$(MAKE) -C examples/argv_fuzzing + @#$(MAKE) -C examples/afl_network_proxy + @#$(MAKE) -C examples/socket_fuzzing + @#$(MAKE) -C examples/argv_fuzzing %.8: % @echo .TH $* 8 $(BUILD_DATE) "afl++" > $@ diff --git a/llvm_mode/afl-llvm-common.cc b/llvm_mode/afl-llvm-common.cc index 0b89c3b4..0b50c547 100644 --- a/llvm_mode/afl-llvm-common.cc +++ b/llvm_mode/afl-llvm-common.cc @@ -60,7 +60,7 @@ bool isIgnoreFunction(const llvm::Function *F) { "asan.", "llvm.", "sancov.", - "__ubsan_handle_", + "__ubsan_", "ign.", "__afl_", "_fini", diff --git a/test/test-llvm.sh b/test/test-llvm.sh index 24fc6a34..02d23f9c 100755 --- a/test/test-llvm.sh +++ b/test/test-llvm.sh @@ -25,7 +25,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && { } || { $ECHO "$GREEN[+] llvm_mode instrumentation present and working correctly" TUPLES=`echo 0|../afl-showmap -m ${MEM_LIMIT} -o /dev/null -- ./test-instr.plain 2>&1 | grep Captur | awk '{print$3}'` - test "$TUPLES" -gt 3 -a "$TUPLES" -lt 7 && { + test "$TUPLES" -gt 3 -a "$TUPLES" -lt 8 && { $ECHO "$GREEN[+] llvm_mode run reported $TUPLES instrumented locations which is fine" } || { $ECHO "$RED[!] llvm_mode instrumentation produces weird numbers: $TUPLES" diff --git a/test/travis/bionic/Dockerfile b/test/travis/bionic/Dockerfile index d1b53e70..00ab96f9 100644 --- a/test/travis/bionic/Dockerfile +++ b/test/travis/bionic/Dockerfile @@ -31,6 +31,7 @@ RUN apt-get update && apt-get -y install \ ENV AFL_NO_UI=1 ENV AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1 +ENV LLVM_CONFIG=llvm-config-6.0 RUN cd / && \ git clone https://github.com/AFLplusplus/AFLplusplus && \ |