[tor-commits] [tor/release-0.4.0] Use MAP_INHERIT_ZERO or MAP_INHERIT_NONE if available.

[teor at torproject.org]

commit 7971b3a5a6fc8b964339b144ae33faf9db1c3869
Author: Taylor R Campbell <campbell+tor at mumble.net>
Date:   Sat May 25 03:55:24 2019 +0000

    Use MAP_INHERIT_ZERO or MAP_INHERIT_NONE if available.
    
    Fixes assertion failure in tests on NetBSD:
    
    slow/prob_distr/stochastic_log_logistic: [forking] May 25 03:56:58.091 [err] tor_assertion_failed_(): Bug: src/lib/crypt_ops/crypto_rand_fast.c:184: crypto_fast_rng_new_from_seed: Assertion inherit != INHERIT_RES_KEEP failed; aborting. (on Tor 0.4.1.1-alpha-dev 29955f13e5bc8e61)
    May 25 03:56:58.091 [err] Bug: Assertion inherit != INHERIT_RES_KEEP failed in crypto_fast_rng_new_from_seed at src/lib/crypt_ops/crypto_rand_fast.c:184: . (Stack trace not available) (on Tor 0.4.1.1-alpha-dev 29955f13e5bc8e61)
    [Lost connection!]
---
 src/lib/malloc/map_anon.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c
index 2fc6e89ea..2430f7ad1 100644
--- a/src/lib/malloc/map_anon.c
+++ b/src/lib/malloc/map_anon.c
@@ -50,11 +50,15 @@
 
 #ifdef INHERIT_ZERO
 #define FLAG_ZERO INHERIT_ZERO
+#elif defined(MAP_INHERIT_ZERO)
+#define FLAG_ZERO MAP_INHERIT_ZERO
 #endif
 #ifdef INHERIT_NONE
 #define FLAG_NOINHERIT INHERIT_NONE
 #elif defined(VM_INHERIT_NONE)
 #define FLAG_NOINHERIT VM_INHERIT_NONE
+#elif defined(MAP_INHERIT_NONE)
+#define FLAG_NOINHERIT MAP_INHERIT_NONE
 #endif
 
 #elif defined(HAVE_MADVISE)