From a602177943257d19cf62df5f19a341a66acca8d7 Mon Sep 17 00:00:00 2001
From: Sandboxed API Team <sandboxed-api@google.com>
Date: Tue, 7 Jul 2020 02:39:55 -0700
Subject: [PATCH] Fix AllowLlvmSanitizers for Msan.

PiperOrigin-RevId: 319947612
Change-Id: I6485d8282381c4cb2be05e138e007ccbb3e5d956
---
 sandboxed_api/sandbox2/policybuilder.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sandboxed_api/sandbox2/policybuilder.cc b/sandboxed_api/sandbox2/policybuilder.cc
index 671bd69..9eec379 100644
--- a/sandboxed_api/sandbox2/policybuilder.cc
+++ b/sandboxed_api/sandbox2/policybuilder.cc
@@ -175,7 +175,8 @@ PolicyBuilder& PolicyBuilder::AllowSystemMalloc() {
 }
 
 PolicyBuilder& PolicyBuilder::AllowLlvmSanitizers() {
-#if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER)
+#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
+    defined(THREAD_SANITIZER)
   AddPolicyOnSyscall(__NR_madvise, {
                                        ARG_32(2),
                                        JEQ32(MADV_DONTDUMP, ALLOW),