1*4882a593SmuzhiyunFrom 1281ffc7959bd2070563e17a52ee4424196d885c Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Patrick Havelange <patrick.havelange@essensium.com>
3*4882a593SmuzhiyunDate: Wed, 23 Jan 2019 12:21:21 +0100
4*4882a593SmuzhiyunSubject: [PATCH] Introduce the OPENSSL_NO_MADVISE to disable call to madvise()
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunUpstream: https://github.com/openssl/openssl/pull/8089
7*4882a593SmuzhiyunSigned-off-by: Patrick Havelange <patrick.havelange@essensium.com>
8*4882a593Smuzhiyun---
9*4882a593Smuzhiyun crypto/mem_sec.c | 2 +-
10*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
11*4882a593Smuzhiyun
12*4882a593Smuzhiyundiff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
13*4882a593Smuzhiyunindex 9e0f670..32c7282 100644
14*4882a593Smuzhiyun--- a/crypto/mem_sec.c
15*4882a593Smuzhiyun+++ b/crypto/mem_sec.c
16*4882a593Smuzhiyun@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize)
17*4882a593Smuzhiyun     if (mlock(sh.arena, sh.arena_size) < 0)
18*4882a593Smuzhiyun         ret = 2;
19*4882a593Smuzhiyun #endif
20*4882a593Smuzhiyun-#ifdef MADV_DONTDUMP
21*4882a593Smuzhiyun+#if defined(MADV_DONTDUMP) && !defined(OPENSSL_NO_MADVISE)
22*4882a593Smuzhiyun     if (madvise(sh.arena, sh.arena_size, MADV_DONTDUMP) < 0)
23*4882a593Smuzhiyun         ret = 2;
24*4882a593Smuzhiyun #endif
25*4882a593Smuzhiyun--
26*4882a593Smuzhiyun2.17.1
27*4882a593Smuzhiyun
28