From: David Carlier <devnexen@gmail.com>
Date: Tue, 8 Dec 2020 17:43:10 +0000 (+0000)
Subject: CRYPTO_secure_malloc_init: BSD support improvements.
X-Git-Tag: OpenSSL_1_1_1j~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9be10637502bf32189055dff8d3442e140e845c5;p=thirdparty%2Fopenssl.git

CRYPTO_secure_malloc_init: BSD support improvements.

Backport of #13394

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/13637)
---

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index b5f959ba15d..222c786cbae 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -34,6 +34,12 @@
 #   include <errno.h>
 #  endif
 # endif
+# if defined(__FreeBSD__)
+#  define MADV_DONTDUMP MADV_NOCORE
+# endif
+# if !defined(MAP_CONCEAL)
+#  define MAP_CONCEAL 0
+# endif
 # include <sys/param.h>
 # include <sys/stat.h>
 # include <fcntl.h>
@@ -442,7 +448,7 @@ static int sh_init(size_t size, int minsize)
     if (1) {
 #ifdef MAP_ANON
         sh.map_result = mmap(NULL, sh.map_size,
-                             PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
+                             PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE|MAP_CONCEAL, -1, 0);
     } else {
 #endif
         int fd;