From eacc9ca319f2ba2450f8a427d157d8aef7e1ef32 Mon Sep 17 00:00:00 2001
From: kiwigitops <kiwisclubco@gmail.com>
Date: Wed, 20 May 2026 15:02:23 -0400
Subject: [PATCH] Avoid repeated ASLR re-exec attempts

---
 src/benchmark.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/benchmark.cc b/src/benchmark.cc
index e866d296dc..57f46f4a23 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -860,6 +860,11 @@ void MaybeReenterWithoutASLR(int /*argc*/, char** argv) {
   if ((internal::get_as_unsigned(new_personality) & ADDR_NO_RANDOMIZE) == 0)
     return;
 
+  // Some security profiles clear ADDR_NO_RANDOMIZE across exec even though the
+  // personality appears updated here. Avoid re-entering forever in that case.
+  constexpr const char* kAslrReexecEnv = "BENCHMARK_ASLR_NO_REEXEC";
+  if (std::getenv(kAslrReexecEnv) != nullptr) return;
+  if (setenv(kAslrReexecEnv, "1", 1) != 0) return;
   execv(argv[0], argv);
   // The exec() functions return only if an error has occurred,
   // in which case we want to just continue as-is.