]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
CRYPTO_secure_malloc_init: BSD support improvements.
authorDavid Carlier <devnexen@gmail.com>
Tue, 8 Dec 2020 17:43:10 +0000 (17:43 +0000)
committerBenjamin Kaduk <kaduk@mit.edu>
Wed, 30 Dec 2020 23:26:18 +0000 (15:26 -0800)
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)

crypto/mem_sec.c

index b5f959ba15d5591fd56f703e54656a2b53227d74..222c786cbaeff0e798a57a42fc429cc70bed913f 100644 (file)
 #   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;