From 2e4d4398d9ff7b165a20155fa688d0f2c06ca8f5 Mon Sep 17 00:00:00 2001
From: Jonathan Metzman <metzman@chromium.org>
Date: Tue, 19 Mar 2024 09:35:05 -0400
Subject: [PATCH] Reapply "Fix MSAN on github actions (#11708)"

This reverts commit 33c4a6d4fa7ba4270fb6e5059c6517a1d9e85dfa.
---
 infra/base-images/base-builder/compile   | 2 ++
 infra/base-images/base-runner/run_fuzzer | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile
index 69e132f1d..e0334e8ac 100755
--- a/infra/base-images/base-builder/compile
+++ b/infra/base-images/base-builder/compile
@@ -17,6 +17,8 @@
 
 echo "---------------------------------------------------------------"
 
+sysctl -w vm.mmap_rnd_bits=28
+
 OSS_FUZZ_ON_DEMAND="${OSS_FUZZ_ON_DEMAND:-0}"
 
 # This is a temporary fix: fall back to LLVM14's old pass manager
diff --git a/infra/base-images/base-runner/run_fuzzer b/infra/base-images/base-runner/run_fuzzer
index e7929a311..d3e2e7f2f 100755
--- a/infra/base-images/base-runner/run_fuzzer
+++ b/infra/base-images/base-runner/run_fuzzer
@@ -18,6 +18,8 @@
 # Fuzzer runner. Appends .options arguments and seed corpus to users args.
 # Usage: $0 <fuzzer_name> <fuzzer_args>
 
+sysctl -w vm.mmap_rnd_bits=28
+
 export PATH=$OUT:$PATH
 cd $OUT