aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar van Hauser <vh@thc.org>2021-02-22 16:41:49 +0100
committerGravatar GitHub <noreply@github.com>2021-02-22 07:41:49 -0800
commitb5de0307a7dee13ada0d39c5b2f336f46d77e3fe (patch)
tree0a5ee61a04e2e6ef6ebab4de6f9f64a1237dfec9
parent6fe9d7f01d04bb5ce282942a07d71a1114f5576c (diff)
Fixes for afl++ (#5235)
* output afl++ setup * update commit id
-rw-r--r--infra/base-images/base-builder/Dockerfile2
-rwxr-xr-xinfra/base-images/base-runner/run_fuzzer3
2 files changed, 4 insertions, 1 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 4ac72a19..ee966095 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 a252943236b12c080248747bee06c9c5084b871e
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 08f62e7d..2dd50a85 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