Commit 88bf0d36 authored by Pauli's avatar Pauli Committed by Rich Salz
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2657)

(cherry picked from commit 70e14ffb)
parent fd1ea63f

crypto/mem_sec.c

+4 −1
Original line number Diff line number Diff line 
/*

 * 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;