From 5dbb2cb5ad04e3d17a3c47b834cb00179185b3ef Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Mon, 22 Feb 2021 11:35:28 +0100 Subject: [PATCH 1/2] output afl++ setup --- infra/base-images/base-builder/Dockerfile | 2 +- infra/base-images/base-runner/run_fuzzer | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 4ac72a1908ce..53b8bf4ea50b 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -177,7 +177,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 5dd35f5281afec0955c08fe9f99e3c83222b7764 + git checkout a81b5aa921567ba92c22c9ab1c4493725c43e8aa 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 08f62e7dd2d6..2dd50a85d3da 100755 --- a/infra/base-images/base-runner/run_fuzzer +++ b/infra/base-images/base-runner/run_fuzzer @@ -119,6 +119,9 @@ if [[ "$FUZZING_ENGINE" = afl ]]; then AFL_FUZZER_ARGS="$AFL_FUZZER_ARGS -t 5000+" # AFL expects at least 1 file in the input dir. echo input > ${CORPUS_DIR}/input + echo afl++ setup: + env|grep AFL_ + cat "$OUT/afl_options.txt" CMD_LINE="$OUT/afl-fuzz $AFL_FUZZER_ARGS -i $CORPUS_DIR -o $FUZZER_OUT $(get_dictionary) $* -- $OUT/$FUZZER" elif [[ "$FUZZING_ENGINE" = honggfuzz ]]; then From ebe167f3090fae3ec7f765cef775f54e63187188 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Mon, 22 Feb 2021 13:36:31 +0100 Subject: [PATCH 2/2] update commit id --- infra/base-images/base-builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 53b8bf4ea50b..ee966095db69 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -177,7 +177,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 a81b5aa921567ba92c22c9ab1c4493725c43e8aa + git checkout a252943236b12c080248747bee06c9c5084b871e RUN cd $SRC && \ curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \