From cb2de5a810df1898cd3ae47d517603b8b12371c0 Mon Sep 17 00:00:00 2001 From: nagendra modadugu Date: Wed, 10 May 2017 11:52:46 -0700 Subject: [oss-fuzz] update Dockerfile to point to updated Docker image Sync Dockerfile with upstream, pulling image from gcr.io. Also update README to include instructions on launching alternative fuzzer modes. BUG=none BRANCH=none TEST=follow instructions in fuzz/build.sh Change-Id: I1f2066810a2f1fd9f43cd9b98859759f51dfb935 Signed-off-by: nagendra modadugu Reviewed-on: https://chromium-review.googlesource.com/502068 Commit-Ready: Nagendra Modadugu Tested-by: Nagendra Modadugu Reviewed-by: Vadim Bendebury Reviewed-by: Andrey Pronin --- fuzz/Dockerfile | 8 +++++--- fuzz/README | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fuzz/Dockerfile b/fuzz/Dockerfile index 69e2878..db3e560 100644 --- a/fuzz/Dockerfile +++ b/fuzz/Dockerfile @@ -1,11 +1,13 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # # Defines a docker image that can build fuzzers. # -FROM ossfuzz/base-libfuzzer -RUN apt-get install -y make libssl-dev binutils libgcc-5-dev +FROM gcr.io/oss-fuzz-base/base-builder +RUN apt-get update && apt-get install -y make libssl-dev binutils libgcc-5-dev COPY . /src/tpm2/ COPY fuzz/build.sh /src/ + +WORKDIR tpm2 diff --git a/fuzz/README b/fuzz/README index 4c0cc04..90fd5f6 100644 --- a/fuzz/README +++ b/fuzz/README @@ -32,6 +32,12 @@ To reproduce a crash under gdb: $ docker run -ti --rm -v $(pwd):/src/tpm2 -v /tmp/fuzzers:/out \ ossfuzz/tpm2 + or + + $ docker run -ti --rm -v $(pwd):/src/tpm2 -v /tmp/fuzzers:/out \ + -e FUZZING_ENGINE=libfuzzer \ + -e SANITIZER=
\ + ossfuzz/tpm2 Get a shell in the container -- cgit v1.2.3