[gentoo-commits] gentoo-x86 commit in sys-cluster/openmpi/files: hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch

[Justin Bronder (jsbronder)]

jsbronder    13/07/02 02:04:18

  Added:               
                        hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
  Log:
  Do not override malloc when in a sandbox environment.  Resolves #462602.
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)

Revision  Changes    Path
1.1                  sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch?rev=1.1&content-type=text/plain

Index: hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
===================================================================
From 094de74dc5e518a931c495692143ea3282553674 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@×××××.com>
Date: Mon, 1 Jul 2013 20:37:17 -0400
Subject: [PATCH] hooks:  disable malloc override inside of Gentoo sandbox

As described in the comments in the source, Gentoo's own version of
fakeroot, sandbox, also runs into hangs when malloc is overridden.
Sandbox environments can easily be detected by looking for SANDBOX_PID
in the environment.  When detected, employ the same fix used for
fakeroot.

See https://bugs.gentoo.org/show_bug.cgi?id=462602
---
 opal/mca/memory/linux/hooks.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/opal/mca/memory/linux/hooks.c b/opal/mca/memory/linux/hooks.c
index 6a1646f..ce91e76 100644
--- a/opal/mca/memory/linux/hooks.c
+++ b/opal/mca/memory/linux/hooks.c
@@ -747,9 +747,16 @@ static void opal_memory_linux_malloc_init_hook(void)
        "fakeroot" build environment that allocates memory during
        stat() (see http://bugs.debian.org/531522).  It may not be
        necessary any more since we're using access(), not stat().  But
-       we'll leave the check, anyway. */
+       we'll leave the check, anyway.
+
+       This is also an issue when using Gentoo's version of 'fakeroot',
+       sandbox v2.5.  Sandbox environments can also be detected fairly
+       easily by looking for SANDBOX_PID.
+    */
+
     if (getenv("FAKEROOTKEY") != NULL ||
-        getenv("FAKED_MODE") != NULL) {
+        getenv("FAKED_MODE") != NULL ||
+        getenv("SANDBOX_PID") != NULL ) {
         return;
     }
 
-- 
1.8.1.5