diff options
| author | Taylor R Campbell <campbell+tor@mumble.net> | 2019-05-25 03:55:24 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-05-29 08:56:01 -0400 |
| commit | 7971b3a5a6fc8b964339b144ae33faf9db1c3869 (patch) | |
| tree | d5c27973e06f0a709130dfd8b2633639f6cfc953 /src/lib/malloc | |
| parent | c7f9f7e5426b473a505063904116760c7fae7e11 (diff) | |
| download | tor-7971b3a5a6fc8b964339b144ae33faf9db1c3869.tar.gz tor-7971b3a5a6fc8b964339b144ae33faf9db1c3869.zip | |
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!]
Diffstat (limited to 'src/lib/malloc')
| -rw-r--r-- | src/lib/malloc/map_anon.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 2fc6e89ea2..2430f7ad11 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) |