From 88e9dbf8d46b40a15f18c2f2d9ce90309c7ba5c2 Mon Sep 17 00:00:00 2001
From: Sandboxed API Team <sandboxed-api@google.com>
Date: Wed, 1 Jul 2020 14:08:35 -0700
Subject: [PATCH] Allow Asan to get sigaltstack Include sigaltstack into
 AllowHandleSignals

PiperOrigin-RevId: 319293484
Change-Id: I4d60715893bd07eff047d2bced1450a3cd29bcec
---
 sandboxed_api/sandbox2/policybuilder.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sandboxed_api/sandbox2/policybuilder.cc b/sandboxed_api/sandbox2/policybuilder.cc
index fd1cb92..671bd69 100644
--- a/sandboxed_api/sandbox2/policybuilder.cc
+++ b/sandboxed_api/sandbox2/policybuilder.cc
@@ -184,6 +184,9 @@ PolicyBuilder& PolicyBuilder::AllowLlvmSanitizers() {
   // Sanitizers read from /proc. For example:
   // https://github.com/llvm-mirror/compiler-rt/blob/69445f095c22aac2388f939bedebf224a6efcdaf/lib/sanitizer_common/sanitizer_linux.cpp#L1101
   AddDirectory("/proc");
+#endif
+#if defined(ADDRESS_SANITIZER)
+  AllowSyscall(__NR_sigaltstack);
 #endif
   return *this;
 }
@@ -347,6 +350,9 @@ PolicyBuilder& PolicyBuilder::AllowHandleSignals() {
 #endif
 #ifdef __NR_sigprocmask
       __NR_sigprocmask,
+#endif
+#ifdef __NR_sigaltstack
+      __NR_sigaltstack,
 #endif
   });
 }