The branch OpenSSL_1_1_1-stable has been updated
via b295a4dca17f00d412043b74393b86a16655fac0 (commit)
from 35bb0e44c6168facbb3acedbc7d4f2dcbdd65224 (commit)
- Log -----------------------------------------------------------------
commit b295a4dca17f00d412043b74393b86a16655fac0
Author: Tristan Bauer <[email protected]>
Date: Thu Jun 18 11:45:24 2020 +0200
Fix wrong return value check of mmap function
The mmap function never returns NULL. If an error occurs, the function
returns MAP_FAILED.
CLA: trivial
Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/12187)
(cherry picked from commit 1d78129dd205e3e85083a91c33540a70c51b0a23)
-----------------------------------------------------------------------
Summary of changes:
crypto/mem_sec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 9e0f6702f4..8bcb0509c1 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -502,7 +502,7 @@ static void sh_done(void)
OPENSSL_free(sh.freelist);
OPENSSL_free(sh.bittable);
OPENSSL_free(sh.bitmalloc);
- if (sh.map_result != NULL && sh.map_size)
+ if (sh.map_result != MAP_FAILED && sh.map_size)
munmap(sh.map_result, sh.map_size);
memset(&sh, 0, sizeof(sh));
}
