Commit cc9c5689 authored by Dmitry-Me's avatar Dmitry-Me Committed by Kurt Roeckx
Browse files

Ensure allocation size fits into size_t 

Signed-off-by: default avatarKurt Roeckx <kurt@roeckx.be>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>

GH: #630
parent 01a2ade0

crypto/evp/scrypt.c

+11 −4
Changes for crypto/evp/scrypt.c: 11 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 
    unsigned char *B;

    uint32_t *X, *V, *T;

    uint64_t i, Blen, Vlen;

    size_t allocsize;



    /* Sanity check parameters */

    /* initial check, r,p must be non zero, N >= 2 and a power of 2 */
@@ -242,7 +243,8 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 
    Blen = p * 128 * r;



    /*

     * Check 32 * r * (N + 2) * sizeof(uint32_t) fits in uint64_t.

     * Check 32 * r * (N + 2) * sizeof(uint32_t) fits in

     * uint64_t and also size_t (their sizes are unrelated).

     * This is combined size V, X and T (section 4)

     */

    i = UINT64_MAX / (32 * sizeof(uint32_t));
@@ -253,11 +255,16 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 
    /* check total allocated size fits in uint64_t */

    if (Blen > UINT64_MAX - Vlen)

        return 0;

    /* check total allocated size fits in size_t */

    if (Blen > SIZE_MAX - Vlen)

        return 0;



    allocsize = (size_t)(Blen + Vlen);



    if (maxmem == 0)

        maxmem = SCRYPT_MAX_MEM;



    if (Blen + Vlen > maxmem) {

    if (allocsize > maxmem) {

        EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED);

        return 0;

    }
@@ -266,7 +273,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 
    if (key == NULL)

        return 1;



    B = OPENSSL_malloc(Blen + Vlen);

    B = OPENSSL_malloc(allocsize);

    if (B == NULL)

        return 0;

    X = (uint32_t *)(B + Blen);
@@ -294,7 +301,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 
    BIO_dump_fp(stderr, (char *)key, keylen);

#endif

 err:

    OPENSSL_clear_free(B, Blen + Vlen);

    OPENSSL_clear_free(B, allocsize);

    return rv;

}

#endif