infra: msan enable PIC (#11917)

Not sure why `LLVM_ENABLE_PIC` needs to be enabled manually. It should be by default, according to https://llvm.org/docs/CMake.html#llvm-related-variables --------- Co-authored-by: MarcoFalke <6399679+MarcoFalke@users.noreply.github.com>
google · May 9, 2024 · e3ccec7 · e3ccec7
1 parent 74769fa
commit e3ccec7
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-# Docker image with head clang installed.
+# Docker image with clang installed.
 
 FROM gcr.io/oss-fuzz-base/base-image
 

diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh
@@ -223,6 +223,7 @@ function cmake_libcxx {
       -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
       -DLIBCXXABI_ENABLE_SHARED=OFF \
       -DCMAKE_BUILD_TYPE=Release \
+      -DLLVM_ENABLE_PIC=ON \
       -DLLVM_TARGETS_TO_BUILD="$TARGET_TO_BUILD" \
       -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
       -DLLVM_BINUTILS_INCDIR="/usr/include/" \

diff --git a/projects/brunsli/project.yaml b/projects/brunsli/project.yaml
@@ -6,7 +6,7 @@ vendor_ccs:
   - "twsmith@mozilla.com"
 sanitizers:
   - address
-  # - memory ## msan disabled after a clang bump. Please re-enable it, Try to fix any build warnings and build errors, as well as msan runtime warnings and errors. msan failure log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-f5583c45-faa2-44d4-8b2f-b27e83c25588.txt
+  - memory
   - undefined
 architectures:
   - x86_64

diff --git a/projects/libplist/Dockerfile b/projects/libplist/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-# Pinned because of https://github.com/google/oss-fuzz/pull/11887
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:b61fe9b3100043f683ca3ef6dc1f940b7da43c011b10ceecbf530f943a0c2d6d
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool pkg-config
 
 RUN git clone --depth 1 https://github.com/libimobiledevice/libplist

diff --git a/projects/libraw/Dockerfile b/projects/libraw/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-# Pinned because of https://github.com/google/oss-fuzz/pull/11887
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:b61fe9b3100043f683ca3ef6dc1f940b7da43c011b10ceecbf530f943a0c2d6d
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool pkg-config zlib1g-dev
 RUN git clone --depth 1 https://github.com/libraw/libraw
 WORKDIR libraw

diff --git a/projects/libreoffice/project.yaml b/projects/libreoffice/project.yaml
@@ -3,9 +3,8 @@ language: c++
 primary_contact: "caolanm@gmail.com"
 sanitizers:
   - address
-  #- memory:
-  #   experimental: True
-  #   # - memory ## msan disabled after a clang bump. Please re-enable it, Try to fix any build warnings and build errors, as well as msan runtime warnings and errors. msan failure log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-712b40fe-c70f-4ece-90a2-150c61afc6f4.txt
+  - memory:
+     experimental: True
   - undefined
 fuzzing_engines:
   # see https://github.com/google/oss-fuzz/issues/6233 for missing afl

diff --git a/projects/quantlib/project.yaml b/projects/quantlib/project.yaml
@@ -6,7 +6,7 @@ auto_ccs:
   - nathaniel.brough@gmail.com
 sanitizers:
  - address
- # - memory ## msan disabled after a clang bump. Please re-enable it, Try to fix any build warnings and build errors, as well as msan runtime warnings and errors. msan failure log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-d6a22300-216b-497d-999c-9b12779d05e2.txt
+ - memory
 fuzzing_engines:
  - libfuzzer
  - honggfuzz
diff --git a/projects/spirv-tools/project.yaml b/projects/spirv-tools/project.yaml
@@ -8,7 +8,7 @@ auto_ccs:
   - "nathangauer@google.com"
 sanitizers:
   - address
-  # - memory ## msan disabled after a clang bump. Please re-enable it, Try to fix any build warnings and build errors, as well as msan runtime warnings and errors. msan failure log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-8e0fc9d7-ba92-4454-94f7-93c4223a30a6.txt
+  - memory
   - undefined
 main_repo: 'https://github.com/KhronosGroup/SPIRV-Tools.git'
 architectures:

diff --git a/projects/wabt/Dockerfile b/projects/wabt/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-# Pinned because of https://github.com/google/oss-fuzz/pull/11887
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:b61fe9b3100043f683ca3ef6dc1f940b7da43c011b10ceecbf530f943a0c2d6d
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y cmake libtool make python
 RUN git clone --recursive https://github.com/WebAssembly/wabt
 WORKDIR wabt