From: Richard Levitte <levitte@openssl.org>
Date: Thu, 29 Sep 2022 11:56:43 +0000 (+0200)
Subject: Adapt CRYPTO_secure_malloc() like CRYPTO_malloc()
X-Git-Tag: openssl-3.2.0-alpha1~1968
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9167a47f78159b0578bc032401ab1d66e14eecdb;p=thirdparty%2Fopenssl.git

Adapt CRYPTO_secure_malloc() like CRYPTO_malloc()

In other words, make it raise ERR_R_MALLOC_FAILURE appropriately.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19301)
---

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 60559a930ed..8d2c161c707 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -17,6 +17,7 @@
  */
 #include "internal/e_os.h"
 #include <openssl/crypto.h>
+#include <openssl/err.h>
 
 #include <string.h>
 
@@ -140,18 +141,27 @@ int CRYPTO_secure_malloc_initialized(void)
 void *CRYPTO_secure_malloc(size_t num, const char *file, int line)
 {
 #ifndef OPENSSL_NO_SECURE_MEMORY
-    void *ret;
+    void *ret = NULL;
     size_t actual_size;
+    int reason = CRYPTO_R_SECURE_MALLOC_FAILURE;
 
     if (!secure_mem_initialized) {
         return CRYPTO_malloc(num, file, line);
     }
-    if (!CRYPTO_THREAD_write_lock(sec_malloc_lock))
-        return NULL;
+    if (!CRYPTO_THREAD_write_lock(sec_malloc_lock)) {
+        reason = ERR_R_CRYPTO_LIB;
+        goto err;
+    }
     ret = sh_malloc(num);
     actual_size = ret ? sh_actual_size(ret) : 0;
     secure_mem_used += actual_size;
     CRYPTO_THREAD_unlock(sec_malloc_lock);
+ err:
+    if (ret == NULL && (file != NULL || line != 0)) {
+        ERR_new();
+        ERR_set_debug(file, line, NULL);
+        ERR_set_error(ERR_LIB_CRYPTO, reason, NULL);
+    }
     return ret;
 #else
     return CRYPTO_malloc(num, file, line);