From 2e3799162e4cdd13fcf71335d8a336d9eccea323 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 19 May 2024 10:10:55 +0200 Subject: [PATCH 1/4] update AFL++ commit id --- fuzzers/aflplusplus/builder.Dockerfile | 2 +- fuzzers/aflplusplus/runner.Dockerfile | 2 +- fuzzers/aflplusplus_frida/builder.Dockerfile | 2 +- fuzzers/aflplusplus_qemu/builder.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuzzers/aflplusplus/builder.Dockerfile b/fuzzers/aflplusplus/builder.Dockerfile index 6f33b4247..fc0561c41 100644 --- a/fuzzers/aflplusplus/builder.Dockerfile +++ b/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 27d05f3c216e18163236efa42b630a5b3784d2e9 || \ + git checkout 56d5aa3101945e81519a3fac8783d0d8fad82779 || \ true # Build without Python support as we don't need it. diff --git a/fuzzers/aflplusplus/runner.Dockerfile b/fuzzers/aflplusplus/runner.Dockerfile index 1a10f861c..5640d5b24 100644 --- a/fuzzers/aflplusplus/runner.Dockerfile +++ b/fuzzers/aflplusplus/runner.Dockerfile @@ -21,4 +21,4 @@ ENV PATH="$PATH:/out" ENV AFL_SKIP_CPUFREQ=1 ENV AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1 ENV AFL_TESTCACHE_SIZE=2 -RUN apt install -y unzip git gdb joe +# RUN apt-get update && apt-get upgrade && apt install -y unzip git gdb joe diff --git a/fuzzers/aflplusplus_frida/builder.Dockerfile b/fuzzers/aflplusplus_frida/builder.Dockerfile index 24dc2101f..a10234668 100644 --- a/fuzzers/aflplusplus_frida/builder.Dockerfile +++ b/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 27d05f3c216e18163236efa42b630a5b3784d2e9 + cd /afl && git checkout 56d5aa3101945e81519a3fac8783d0d8fad82779 # Build afl++ without Python support as we don't need it. # Set AFL_NO_X86 to skip flaky tests. diff --git a/fuzzers/aflplusplus_qemu/builder.Dockerfile b/fuzzers/aflplusplus_qemu/builder.Dockerfile index ad8f2e1d9..4c0ff5b0c 100644 --- a/fuzzers/aflplusplus_qemu/builder.Dockerfile +++ b/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 27d05f3c216e18163236efa42b630a5b3784d2e9 || true + cd /afl && git checkout 56d5aa3101945e81519a3fac8783d0d8fad82779 || true # Build afl++ without Python support as we don't need it. # Set AFL_NO_X86 to skip flaky tests. From fa202e728a17e254ec1e3a4d974a0b4831893600 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Tue, 14 Jan 2025 12:52:01 +0100 Subject: [PATCH 2/4] update AFL++ and Mopt --- fuzzers/aflplusplus/builder.Dockerfile | 2 +- fuzzers/aflplusplus/fuzzer.py | 1 + fuzzers/aflplusplus_frida/builder.Dockerfile | 2 +- fuzzers/aflplusplus_frida/fuzzer.py | 1 + fuzzers/aflplusplus_qemu/builder.Dockerfile | 2 +- fuzzers/aflplusplus_qemu/fuzzer.py | 2 ++ fuzzers/mopt/builder.Dockerfile | 2 +- 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fuzzers/aflplusplus/builder.Dockerfile b/fuzzers/aflplusplus/builder.Dockerfile index fc0561c41..d8a2682d2 100644 --- a/fuzzers/aflplusplus/builder.Dockerfile +++ b/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 7ad694716bf9772d8db5fbbe3f7aec4be99e61df || \ true # Build without Python support as we don't need it. diff --git a/fuzzers/aflplusplus/fuzzer.py b/fuzzers/aflplusplus/fuzzer.py index 7016da75e..566607790 100755 --- a/fuzzers/aflplusplus/fuzzer.py +++ b/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' diff --git a/fuzzers/aflplusplus_frida/builder.Dockerfile b/fuzzers/aflplusplus_frida/builder.Dockerfile index a10234668..7a289525b 100644 --- a/fuzzers/aflplusplus_frida/builder.Dockerfile +++ b/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 7ad694716bf9772d8db5fbbe3f7aec4be99e61df # Build afl++ without Python support as we don't need it. # Set AFL_NO_X86 to skip flaky tests. diff --git a/fuzzers/aflplusplus_frida/fuzzer.py b/fuzzers/aflplusplus_frida/fuzzer.py index 520bbdbf2..d5d1500c7 100755 --- a/fuzzers/aflplusplus_frida/fuzzer.py +++ b/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)) diff --git a/fuzzers/aflplusplus_qemu/builder.Dockerfile b/fuzzers/aflplusplus_qemu/builder.Dockerfile index 4c0ff5b0c..fa0da1b3f 100644 --- a/fuzzers/aflplusplus_qemu/builder.Dockerfile +++ b/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 7ad694716bf9772d8db5fbbe3f7aec4be99e61df || true # Build afl++ without Python support as we don't need it. # Set AFL_NO_X86 to skip flaky tests. diff --git a/fuzzers/aflplusplus_qemu/fuzzer.py b/fuzzers/aflplusplus_qemu/fuzzer.py index f2f6c2945..a675a378b 100755 --- a/fuzzers/aflplusplus_qemu/fuzzer.py +++ b/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, diff --git a/fuzzers/mopt/builder.Dockerfile b/fuzzers/mopt/builder.Dockerfile index afd22521e..d3a094752 100644 --- a/fuzzers/mopt/builder.Dockerfile +++ b/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 .. From 5d8cf2b28fe6f2d3f71f030343b51b60773837e2 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Wed, 15 Jan 2025 12:59:52 +0100 Subject: [PATCH 3/4] update description --- fuzzers/aflplusplus/description.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fuzzers/aflplusplus/description.md b/fuzzers/aflplusplus/description.md index f7eb407ad..6bc8ce5da 100644 --- a/fuzzers/aflplusplus/description.md +++ b/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/) From 6262ecdb31e1826d56173c3108aa251cb47575e5 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Thu, 16 Jan 2025 14:08:56 +0100 Subject: [PATCH 4/4] update afl++ --- fuzzers/aflplusplus/builder.Dockerfile | 2 +- fuzzers/aflplusplus_frida/builder.Dockerfile | 2 +- fuzzers/aflplusplus_qemu/builder.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fuzzers/aflplusplus/builder.Dockerfile b/fuzzers/aflplusplus/builder.Dockerfile index d8a2682d2..f750836ed 100644 --- a/fuzzers/aflplusplus/builder.Dockerfile +++ b/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 7ad694716bf9772d8db5fbbe3f7aec4be99e61df || \ + git checkout b2a01936c3fba8bb2208d30564bc7d7f0e050260 || \ true # Build without Python support as we don't need it. diff --git a/fuzzers/aflplusplus_frida/builder.Dockerfile b/fuzzers/aflplusplus_frida/builder.Dockerfile index 7a289525b..7ac36c373 100644 --- a/fuzzers/aflplusplus_frida/builder.Dockerfile +++ b/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 7ad694716bf9772d8db5fbbe3f7aec4be99e61df + cd /afl && git checkout b2a01936c3fba8bb2208d30564bc7d7f0e050260 # Build afl++ without Python support as we don't need it. # Set AFL_NO_X86 to skip flaky tests. diff --git a/fuzzers/aflplusplus_qemu/builder.Dockerfile b/fuzzers/aflplusplus_qemu/builder.Dockerfile index fa0da1b3f..3c927d06d 100644 --- a/fuzzers/aflplusplus_qemu/builder.Dockerfile +++ b/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 7ad694716bf9772d8db5fbbe3f7aec4be99e61df || 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.