From 34abb30e14474f89248ce9e7d1e3f33e1e7ab7a1 Mon Sep 17 00:00:00 2001
From: Daniel Rakos <daniel.rakos@rastergrid.com>
Date: Mon, 18 Mar 2024 15:01:45 +0100
Subject: [PATCH] build: Fix CI sanitizer failures

---
 .github/workflows/vvl.yml    | 3 +++
 .github/workflows/vvl_sc.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/vvl.yml b/.github/workflows/vvl.yml
index 6e3582c65..9b5814e23 100644
--- a/.github/workflows/vvl.yml
+++ b/.github/workflows/vvl.yml
@@ -80,6 +80,9 @@ jobs:
       - uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: ${{ matrix.config }}-${{ matrix.sanitize }}-${{matrix.robin_hood}}
+      # This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer
+      # https://github.com/google/sanitizers/issues/1716
+      - run: sudo sysctl vm.mmap_rnd_bits=28
       - run: sudo apt-get -qq update && sudo apt-get install -y libwayland-dev xorg-dev
       - run: python scripts/tests.py --build --config ${{ matrix.config }} --cmake='-DUSE_ROBIN_HOOD_HASHING=${{matrix.robin_hood}}'
         env:
diff --git a/.github/workflows/vvl_sc.yml b/.github/workflows/vvl_sc.yml
index 665a41cfb..78f3f454b 100644
--- a/.github/workflows/vvl_sc.yml
+++ b/.github/workflows/vvl_sc.yml
@@ -68,6 +68,9 @@ jobs:
         run: echo "/usr/lib/ccache" >> $GITHUB_PATH
       - name: Set PYTHONPATH
         run: echo "PYTHONPATH=$GITHUB_WORKSPACE/external/${{ matrix.config }}/Vulkan-Headers/registry:$PYTHONPATH" >> $GITHUB_ENV
+      # This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer
+      # https://github.com/google/sanitizers/issues/1716
+      - run: sudo sysctl vm.mmap_rnd_bits=28
       - name: Build VulkanSC-ValidationLayers
         run: |
           echo "PYTHONPATH = $PYTHONPATH"