WIP

pwojcikdev · Dec 19, 2023 · b1f22ce · b1f22ce
1 parent e8b7829
commit b1f22ce
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/code_sanitizers.yml b/.github/workflows/code_sanitizers.yml
@@ -19,7 +19,7 @@ jobs:
       SANITIZER: ${{ matrix.SANITIZER }}
       TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
       DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
-      ASAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report
+      ASAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../asan_suppressions
       TSAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../tsan_suppressions
       UBSAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:print_stacktrace=1
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -250,14 +250,18 @@ else()
       message(STATUS "Using ASAN+UBSAN")
       add_compile_options(-fsanitize=address,undefined)
     endif()
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      add_compile_options(
+              "-fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitize_ignorelist")
+    endif()
     add_definitions(-DED25519_NO_INLINE_ASM)
     add_definitions(-DROCKSDB_UBSAN_RUN)
   elseif(${USING_TSAN})
     message(STATUS "Using TSAN")
     add_compile_options(-fsanitize=thread)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       add_compile_options(
-        "-fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_clang_blacklist")
+        "-fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitize_ignorelist")
     endif()
     add_definitions(-DED25519_NO_INLINE_ASM)
   endif()
@@ -326,14 +330,24 @@ else()
   if(${USING_ASAN_INT})
     set(PLATFORM_LINK_FLAGS
         "${PLATFORM_LINK_FLAGS} -fsanitize=address,undefined,integer")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      set(PLATFORM_LINK_FLAGS
+              "${PLATFORM_LINK_FLAGS} -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitize_ignorelist"
+      )
+    endif()
   elseif(${USING_ASAN})
     set(PLATFORM_LINK_FLAGS
         "${PLATFORM_LINK_FLAGS} -fsanitize=address,undefined")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      set(PLATFORM_LINK_FLAGS
+              "${PLATFORM_LINK_FLAGS} -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitize_ignorelist"
+      )
+    endif()
   elseif(${USING_TSAN})
     set(PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=thread")
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       set(PLATFORM_LINK_FLAGS
-          "${PLATFORM_LINK_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_clang_blacklist"
+          "${PLATFORM_LINK_FLAGS} -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitize_ignorelist"
       )
     endif()
   endif()

diff --git a/asan_suppressions b/asan_suppressions
diff --git a/sanitize_ignorelist b/sanitize_ignorelist
@@ -0,0 +1,2 @@
+src:*crypto/ed25519*
+src:*crypto/blake2*
diff --git a/tsan_clang_blacklist b/tsan_clang_blacklist
@@ -1,2 +1,5 @@
 src:*mdb.c
-src:*midl.c
+src:*midl.c
+
+src:*crypto/ed25519*
+src:*crypto/blake2*