The branch master has been updated
via 8d4b5260d22cc05894d606edd6cfc524661ab6e9 (commit)
via 27db6118722a8af928aa6e4d1be865fa46fb0f0c (commit)
from c60b5723194952d2e4bbfc1e4a3eb07b7581edd9 (commit)
- Log -----------------------------------------------------------------
commit 8d4b5260d22cc05894d606edd6cfc524661ab6e9
Author: David Carlier <devne...@gmail.com>
Date: Fri Nov 13 10:16:55 2020 +0000
Add MAP_CONCEAL from OpenBSD which has similar purpose but on mmap
call level.
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13394)
commit 27db6118722a8af928aa6e4d1be865fa46fb0f0c
Author: David Carlier <devne...@gmail.com>
Date: Fri Nov 13 06:07:52 2020 +0000
CRYPTO_secure_malloc_init: Add FreeBSD support for secure-malloc
dont-dump-region.
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13394)
-----------------------------------------------------------------------
Summary of changes:
crypto/mem_sec.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index ee3750725c..cc4c4e08f6 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -32,6 +32,12 @@
# include <sys/types.h>
# if defined(OPENSSL_SYS_UNIX)
# include <sys/mman.h>
+# if defined(__FreeBSD__)
+# define MADV_DONTDUMP MADV_NOCORE
+# endif
+# if !defined(MAP_CONCEAL)
+# define MAP_CONCEAL 0
+# endif
# endif
# if defined(OPENSSL_SYS_LINUX)
# include <sys/syscall.h>
@@ -468,7 +474,7 @@ static int sh_init(size_t size, size_t minsize)
#if !defined(_WIN32)
# 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
{
int fd;
