secmem: ignore small minsize arguments to CRYPTO_secure_malloc_init().

If the user specifies a minimum allocation size that is smaller than
the free list structure (or zero), calculate the minimum possible size rather
than failing.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11149)

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 79362c582672a55e525f95064fc45e00952fa69e..b70c0a97ca75c4742d01c1759b38f2e74875391b 100644 (file)
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -378,17 +378,33 @@ static int sh_init(size_t size, size_t minsize)
 
     memset(&sh, 0, sizeof(sh));
 
 
     memset(&sh, 0, sizeof(sh));
 

-    /* make sure size and minsize are powers of 2 */
+    /* make sure size is a powers of 2 */

     OPENSSL_assert(size > 0);
     OPENSSL_assert((size & (size - 1)) == 0);
     OPENSSL_assert(size > 0);
     OPENSSL_assert((size & (size - 1)) == 0);

-    OPENSSL_assert((minsize & (minsize - 1)) == 0);

     if (size == 0 || (size & (size - 1)) != 0)
         goto err;
     if (size == 0 || (size & (size - 1)) != 0)
         goto err;

-    if (minsize == 0 || (minsize & (minsize - 1)) != 0)
-        goto err;

 
 

-    while (minsize < sizeof(SH_LIST))
-        minsize *= 2;
+    if (minsize <= sizeof(SH_LIST)) {
+        OPENSSL_assert(sizeof(SH_LIST) <= 65536);
+        /*
+         * Compute the minimum possible allocation size.
+         * This must be a power of 2 and at least as large as the SH_LIST
+         * structure.
+         */
+        minsize = sizeof(SH_LIST) - 1;
+        minsize |= minsize >> 1;
+        minsize |= minsize >> 2;
+        if (sizeof(SH_LIST) > 16)
+            minsize |= minsize >> 4;
+        if (sizeof(SH_LIST) > 256)
+            minsize |= minsize >> 8;
+        minsize++;
+    } else {
+        /* make sure minsize is a powers of 2 */
+          OPENSSL_assert((minsize & (minsize - 1)) == 0);
+          if ((minsize & (minsize - 1)) != 0)
+              goto err;
+    }

 
     sh.arena_size = size;
     sh.minsize = minsize;
 
     sh.arena_size = size;
     sh.minsize = minsize;