From 6ca95a181777643cefa74d5c604f82d06a6929e5 Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Mon, 14 Jun 2021 16:37:20 +0200
Subject: [PATCH] enhance afl++ performance (#5916)

---
 infra/base-images/base-builder/Dockerfile | 2 +-
 infra/base-images/base-runner/run_fuzzer  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index cf6d45639..9d0661ccf 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -181,7 +181,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 5997a4fc09163c1baa186f5a9d00c4c8668a72b1
+    git checkout ade8cdca55951958024c86766453430f904381c5
 
 RUN cd $SRC && \
     curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \
diff --git a/infra/base-images/base-runner/run_fuzzer b/infra/base-images/base-runner/run_fuzzer
index c27f8a330..19403c40e 100755
--- a/infra/base-images/base-runner/run_fuzzer
+++ b/infra/base-images/base-runner/run_fuzzer
@@ -103,8 +103,9 @@ if [[ "$FUZZING_ENGINE" = afl ]]; then
   export UBSAN_OPTIONS="$UBSAN_OPTIONS:symbolize=0"
   export AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1
   export AFL_SKIP_CPUFREQ=1
-  export AFL_NO_AFFINITY=1
+  export AFL_TRY_AFFINITY=1
   export AFL_FAST_CAL=1
+  export AFL_CMPLOG_ONLY_NEW=1
   export AFL_FORKSRV_INIT_TMOUT=30000
   # 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.