aboutsummaryrefslogtreecommitdiff
path: root/infra/base-images
diff options
context:
space:
mode:
authorjonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>2021-03-02 09:20:40 -0800
committerGitHub <noreply@github.com>2021-03-02 09:20:40 -0800
commitf5901265d100cfbcb91d05cd97dab308a3d300d6 (patch)
tree962771ac9d88ff80dc43f6d07aa866fb9cea2d46 /infra/base-images
parent0e8a05d04c4b790f5b35fb037bedea49f2a5d80f (diff)
downloadoss-fuzz-f5901265d100cfbcb91d05cd97dab308a3d300d6.tar.gz
[TSAN] Support TSAN (#5266)
We aren't planning on suppoting TSAN on ClusterFuzz. But we can support in CIFuzz since Skia wants it.
Diffstat (limited to 'infra/base-images')
-rw-r--r--infra/base-images/base-builder/Dockerfile2
-rwxr-xr-xinfra/base-images/base-runner/bad_build_check4
2 files changed, 6 insertions, 0 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index fbfb89903..b726812e5 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -131,6 +131,8 @@ ENV SANITIZER_FLAGS_memory "-fsanitize=memory -fsanitize-memory-track-origins"
ENV SANITIZER_FLAGS_dataflow "-fsanitize=dataflow"
+ENV SANITIZER_FLAGS_thread "-fsanitize=thread"
+
# Do not use any sanitizers in the coverage build.
ENV SANITIZER_FLAGS_coverage ""
diff --git a/infra/base-images/base-runner/bad_build_check b/infra/base-images/base-runner/bad_build_check
index 759985c25..01f8fbbab 100755
--- a/infra/base-images/base-runner/bad_build_check
+++ b/infra/base-images/base-runner/bad_build_check
@@ -334,6 +334,7 @@ function check_mixed_sanitizers {
local MSAN_CALLS=$(objdump -dC $FUZZER | egrep "${CALL_INSN}__msan" -c)
local UBSAN_CALLS=$(objdump -dC $FUZZER | egrep "${CALL_INSN}__ubsan" -c)
+
if [[ "$SANITIZER" = address ]]; then
check_asan_build $FUZZER $ASAN_CALLS $DFSAN_CALLS $MSAN_CALLS $UBSAN_CALLS
result=$?
@@ -346,6 +347,9 @@ function check_mixed_sanitizers {
elif [[ "$SANITIZER" = undefined ]]; then
check_ubsan_build $FUZZER $ASAN_CALLS $DFSAN_CALLS $MSAN_CALLS $UBSAN_CALLS
result=$?
+ elif [[ "$SANITIZER" = thread ]]; then
+ # TODO(metzman): Implement this.
+ result=0
fi
return $result