[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  70e14ffbaf6a67dab56c24cae01f1248cf3f1e77 (commit)
      from  9bb6f82958537b9ab5ec8fe44c762f448d4a59d8 (commit)


- Log -----------------------------------------------------------------
commit 70e14ffbaf6a67dab56c24cae01f1248cf3f1e77
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Feb 17 10:39:20 2017 +1000

    Ensure minsize >= sizeof(SH_LIST)
    
    The sh_add_to_list function will overwrite subsequent slots in the free list
    for small allocations.  This causes a segmentation fault if the writes goes
    off the end of the secure memory.  I've not investigated if this problem
    can overwrite memory without the segmentation fault, but it seems likely.
    
    This fix limits the minsize to the sizeof of the SH_LIST structure (which
    also has a side effect of properly aligning the pointers).
    
    The alternative would be to return an error if minsize is too small.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2657)

-----------------------------------------------------------------------

Summary of changes:
 crypto/mem_sec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 0c79b43..4a3f2a8 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -352,6 +352,9 @@ static int sh_init(size_t size, int minsize)
     if (minsize <= 0 || (minsize & (minsize - 1)) != 0)
         goto err;
 
+    while (minsize < (int)sizeof(SH_LIST))
+        minsize *= 2;
+
     sh.arena_size = size;
     sh.minsize = minsize;
     sh.bittable_size = (sh.arena_size / sh.minsize) * 2;