From: Tristan Bauer <67098820+trisbauer@users.noreply.github.com>
Date: Thu, 18 Jun 2020 09:45:24 +0000 (+0200)
Subject: Fix wrong return value check of mmap function
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b295a4dca17f00d412043b74393b86a16655fac0;p=oweals%2Fopenssl.git

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)
---

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));
 }