From b46d125fd17100b23fb52ebb0741a81760262422 Mon Sep 17 00:00:00 2001 From: Addison Crump Date: Thu, 24 Aug 2023 15:52:26 +0200 Subject: [PATCH 1/5] update libafl_libfuzzer --- fuzzers/libafl_libfuzzer/builder.Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fuzzers/libafl_libfuzzer/builder.Dockerfile b/fuzzers/libafl_libfuzzer/builder.Dockerfile index 54d4bf776..a81392817 100644 --- a/fuzzers/libafl_libfuzzer/builder.Dockerfile +++ b/fuzzers/libafl_libfuzzer/builder.Dockerfile @@ -28,15 +28,14 @@ RUN apt-get update && \ # Uninstall old Rust & Install the latest one. RUN if which rustup; then rustup self uninstall -y; fi && \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \ - sh /rustup.sh --default-toolchain nightly -y && \ + sh /rustup.sh --default-toolchain nightly-2023-08-23 -y && \ rm /rustup.sh # Download libafl. RUN git clone \ - --branch libfuzzer \ https://github.com/AFLplusplus/libafl /libafl && \ cd /libafl && \ - git checkout d31f82387d1d233771ff1e13ef7e49cdb508410f && \ + git checkout 920853195104845bd6b31e5a2dbdcde2c1472c08 && \ unset CFLAGS CXXFLAGS && \ export LIBAFL_EDGES_MAP_SIZE=2621440 && \ cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \ From 918c5dbb0c4e232b41e96206f011741a1d18b43e Mon Sep 17 00:00:00 2001 From: Addison Crump Date: Thu, 24 Aug 2023 16:26:35 +0200 Subject: [PATCH 2/5] default features are now sane --- fuzzers/libafl_libfuzzer/builder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuzzers/libafl_libfuzzer/builder.Dockerfile b/fuzzers/libafl_libfuzzer/builder.Dockerfile index a81392817..5505dc3ae 100644 --- a/fuzzers/libafl_libfuzzer/builder.Dockerfile +++ b/fuzzers/libafl_libfuzzer/builder.Dockerfile @@ -39,5 +39,5 @@ RUN git clone \ unset CFLAGS CXXFLAGS && \ export LIBAFL_EDGES_MAP_SIZE=2621440 && \ cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \ - env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --release --no-default-features && \ + env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --release && \ cp ./target/release/libafl_libfuzzer_runtime.a /usr/lib/libFuzzer.a From 203beeb8ded99d8140996b8f7dbcc22d2954e6ba Mon Sep 17 00:00:00 2001 From: Addison Crump Date: Thu, 24 Aug 2023 17:05:14 +0200 Subject: [PATCH 3/5] reduced debug size for fuzzbench size constraints --- fuzzers/libafl_libfuzzer/builder.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fuzzers/libafl_libfuzzer/builder.Dockerfile b/fuzzers/libafl_libfuzzer/builder.Dockerfile index 5505dc3ae..1dfbb15dc 100644 --- a/fuzzers/libafl_libfuzzer/builder.Dockerfile +++ b/fuzzers/libafl_libfuzzer/builder.Dockerfile @@ -33,11 +33,12 @@ RUN if which rustup; then rustup self uninstall -y; fi && \ # Download libafl. RUN git clone \ + --branch libfuzzer-publish && \ https://github.com/AFLplusplus/libafl /libafl && \ cd /libafl && \ - git checkout 920853195104845bd6b31e5a2dbdcde2c1472c08 && \ + git checkout c66f4bac88ba6323f4435b0b3d25ee69db7ae70e && \ unset CFLAGS CXXFLAGS && \ export LIBAFL_EDGES_MAP_SIZE=2621440 && \ cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \ - env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --release && \ + env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench && \ cp ./target/release/libafl_libfuzzer_runtime.a /usr/lib/libFuzzer.a From 89bd26b6ca20a784af5c8d1a16306a4770f5a580 Mon Sep 17 00:00:00 2001 From: Addison Crump Date: Wed, 13 Sep 2023 17:44:10 +0200 Subject: [PATCH 4/5] fix revision --- fuzzers/libafl_libfuzzer/builder.Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fuzzers/libafl_libfuzzer/builder.Dockerfile b/fuzzers/libafl_libfuzzer/builder.Dockerfile index 1dfbb15dc..d6f28f570 100644 --- a/fuzzers/libafl_libfuzzer/builder.Dockerfile +++ b/fuzzers/libafl_libfuzzer/builder.Dockerfile @@ -32,11 +32,9 @@ RUN if which rustup; then rustup self uninstall -y; fi && \ rm /rustup.sh # Download libafl. -RUN git clone \ - --branch libfuzzer-publish && \ - https://github.com/AFLplusplus/libafl /libafl && \ +RUN git clone https://github.com/AFLplusplus/libafl /libafl && \ cd /libafl && \ - git checkout c66f4bac88ba6323f4435b0b3d25ee69db7ae70e && \ + git checkout defe9084aed5a80ac32fe9a1f3ff00baf97738c6 && \ unset CFLAGS CXXFLAGS && \ export LIBAFL_EDGES_MAP_SIZE=2621440 && \ cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \ From 55b081ec19efd72eb5c96eeaa04fe4491146d5c0 Mon Sep 17 00:00:00 2001 From: Addison Crump Date: Thu, 14 Sep 2023 23:04:50 +0200 Subject: [PATCH 5/5] whoops --- fuzzers/libafl_libfuzzer/builder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuzzers/libafl_libfuzzer/builder.Dockerfile b/fuzzers/libafl_libfuzzer/builder.Dockerfile index d6f28f570..24dbb83c0 100644 --- a/fuzzers/libafl_libfuzzer/builder.Dockerfile +++ b/fuzzers/libafl_libfuzzer/builder.Dockerfile @@ -39,4 +39,4 @@ RUN git clone https://github.com/AFLplusplus/libafl /libafl && \ export LIBAFL_EDGES_MAP_SIZE=2621440 && \ cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \ env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench && \ - cp ./target/release/libafl_libfuzzer_runtime.a /usr/lib/libFuzzer.a + cp ./target/release-fuzzbench/libafl_libfuzzer_runtime.a /usr/lib/libFuzzer.a