summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Bauer <67098820+trisbauer@users.noreply.github.com>2020-06-18 11:45:24 +0200
committerPauli <paul.dale@oracle.com>2020-06-23 10:09:24 +1000
commitb295a4dca17f00d412043b74393b86a16655fac0 (patch)
tree5abccfc131896dc2d31480297e7d129261c9d6cd
parent35bb0e44c6168facbb3acedbc7d4f2dcbdd65224 (diff)
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 <tmraz@fedoraproject.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12187) (cherry picked from commit 1d78129dd205e3e85083a91c33540a70c51b0a23)
-rw-r--r--crypto/mem_sec.c2
1 files changed, 1 insertions, 1 deletions
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));
}