Update AFL++, fix MOpt

fuzzers/aflplusplus/builder.Dockerfile

@@ -37,7 +37,7 @@ RUN apt-get update && \
 # Download afl++.
 RUN git clone -b dev https://github.com/AFLplusplus/AFLplusplus /afl && \
     cd /afl && \
-    git checkout 56d5aa3101945e81519a3fac8783d0d8fad82779 || \
+    git checkout b2a01936c3fba8bb2208d30564bc7d7f0e050260 || \
     true
 
 # Build without Python support as we don't need it.

fuzzers/aflplusplus/description.md

@@ -4,8 +4,9 @@ AFL++ fuzzer instance that has the following config active for all benchmarks:
   - PCGUARD instrumentation 
   - cmplog feature
   - dict2file feature
-  - "fast" power schedule
   - persistent mode + shared memory test cases
+  - envs: AFL_FAST_CAL, AFL_DISABLE_TRIM, AFL_CMPLOG_ONLY_NEW, AFL_NO_SYNC
+Defaults are active otherwise.
 
 Repository: [https://github.com/AFLplusplus/AFLplusplus/](https://github.com/AFLplusplus/AFLplusplus/)
 

fuzzers/aflplusplus/fuzzer.py

@@ -269,6 +269,7 @@ def fuzz(input_corpus,
     os.environ['AFL_IGNORE_UNKNOWN_ENVS'] = '1'
     os.environ['AFL_FAST_CAL'] = '1'
     os.environ['AFL_NO_WARN_INSTABILITY'] = '1'
+    os.environ['AFL_NO_SYNC'] = '1'
 
     if not skip:
         os.environ['AFL_DISABLE_TRIM'] = '1'

fuzzers/aflplusplus_frida/builder.Dockerfile

@@ -28,7 +28,7 @@ RUN apt-get update && \
 
 # Download afl++
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git /afl && \
-    cd /afl && git checkout 56d5aa3101945e81519a3fac8783d0d8fad82779
+    cd /afl && git checkout b2a01936c3fba8bb2208d30564bc7d7f0e050260
 
 # Build afl++ without Python support as we don't need it.
 # Set AFL_NO_X86 to skip flaky tests.

fuzzers/aflplusplus_frida/fuzzer.py

@@ -47,6 +47,7 @@ def fuzz(input_corpus, output_corpus, target_binary):
     os.environ['AFL_FRIDA_PERSISTENT_CNT'] = '1000000'
     os.environ['AFL_FRIDA_PERSISTENT_HOOK'] = '/out/frida_hook.so'
     os.environ['AFL_PATH'] = '/out'
+    os.environ['AFL_NO_SYNC'] = '1'
 
     # resource.setrlimit(resource.RLIMIT_CORE,
     #                    (resource.RLIM_INFINITY, resource.RLIM_INFINITY))

fuzzers/aflplusplus_qemu/builder.Dockerfile

@@ -30,7 +30,7 @@ RUN apt-get update && \
 
 # Download afl++
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git /afl && \
-    cd /afl && git checkout 56d5aa3101945e81519a3fac8783d0d8fad82779 || true
+    cd /afl && git checkout b2a01936c3fba8bb2208d30564bc7d7f0e050260 || true
 
 # Build afl++ without Python support as we don't need it.
 # Set AFL_NO_X86 to skip flaky tests.

fuzzers/aflplusplus_qemu/fuzzer.py

@@ -43,6 +43,8 @@ def fuzz(input_corpus, output_corpus, target_binary):
     os.environ['AFL_ENTRYPOINT'] = target_func
     os.environ['AFL_QEMU_PERSISTENT_CNT'] = '1000000'
     os.environ['AFL_QEMU_DRIVER_NO_HOOK'] = '1'
+    os.environ['AFL_NO_SYNC'] = '1'
+
     aflplusplus_fuzzer.fuzz(input_corpus,
                             output_corpus,
                             target_binary,

fuzzers/mopt/builder.Dockerfile

@@ -18,7 +18,7 @@ FROM $parent_image
 # Set AFL_NO_X86 to skip flaky tests.
 RUN git clone https://github.com/puppet-meteor/MOpt-AFL /afl && \
     cd /afl && \
-    git checkout 45b9f38d2d8b699fd571cfde1bf974974339a21e && \
+    git checkout a9a5dc5c0c291c1cdb09b2b7b27d7cbf1db7ce7b && \
     cd MOpt && AFL_NO_X86=1 make && \
     cp afl-fuzz ..