From e001ca3e18b085661868be9a77bd18bea587780c Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Fri, 27 Mar 2015 14:01:00 -0700
Subject: [PATCH] linker_environ: clear MALLOC_CONF when AT_SECURE=1

Clear JE_MALLOC_CONF and MALLOC_CONF

Change-Id: Ia76e263783194ecaa362e8ccafbe13a28a4a1ba6
---
 linker/linker_environ.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linker/linker_environ.cpp b/linker/linker_environ.cpp
index 7272f4e83..9a0f0099f 100644
--- a/linker/linker_environ.cpp
+++ b/linker/linker_environ.cpp
@@ -115,6 +115,7 @@ static bool __is_unsafe_environment_variable(const char* name) {
       "GCONV_PATH",
       "GETCONF_DIR",
       "HOSTALIASES",
+      "JE_MALLOC_CONF",
       "LD_AOUT_LIBRARY_PATH",
       "LD_AOUT_PRELOAD",
       "LD_AUDIT",
@@ -130,6 +131,7 @@ static bool __is_unsafe_environment_variable(const char* name) {
       "LOCALDOMAIN",
       "LOCPATH",
       "MALLOC_CHECK_",
+      "MALLOC_CONF",
       "MALLOC_TRACE",
       "NIS_PATH",
       "NLSPATH",