Commit 550e1d07 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix a leak in SSL_clear() 



SSL_clear() was resetting numwpipes to 0, but not freeing any allocated
memory for existing write buffers.

Fixes #2026

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 4bf08600)
parent 2ece9c1f

ssl/record/rec_layer_s3.c

+1 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ void RECORD_LAYER_init(RECORD_LAYER *rl, SSL *s) 


void RECORD_LAYER_clear(RECORD_LAYER *rl)

{

    unsigned int pipes;



    rl->rstate = SSL_ST_READ_HEADER;



    /*
@@ -62,9 +60,7 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl) 
    rl->wpend_buf = NULL;



    SSL3_BUFFER_clear(&rl->rbuf);

    for (pipes = 0; pipes < rl->numwpipes; pipes++)

        SSL3_BUFFER_clear(&rl->wbuf[pipes]);

    rl->numwpipes = 0;

    ssl3_release_write_buffer(rl->s);

    rl->numrpipes = 0;

    SSL3_RECORD_clear(rl->rrec, SSL_MAX_PIPELINES);

ssl/record/ssl3_buffer.c

+8 −4
Original line number Diff line number Diff line
@@ -105,13 +105,17 @@ int ssl3_setup_write_buffer(SSL *s, unsigned int numwpipes, size_t len) 


    wb = RECORD_LAYER_get_wbuf(&s->rlayer);

    for (currpipe = 0; currpipe < numwpipes; currpipe++) {

        if (wb[currpipe].buf == NULL) {

            if ((p = OPENSSL_malloc(len)) == NULL) {

        SSL3_BUFFER *thiswb = &wb[currpipe];



        if (thiswb->buf == NULL) {

            p = OPENSSL_malloc(len);

            if (p == NULL) {

                s->rlayer.numwpipes = currpipe;

                goto err;

            }

            wb[currpipe].buf = p;

            wb[currpipe].len = len;

            memset(thiswb, 0, sizeof(SSL3_BUFFER));

            thiswb->buf = p;

            thiswb->len = len;

        }

    }

test/sslapitest.c

+9 −1
Original line number Diff line number Diff line
@@ -101,8 +101,16 @@ static int execute_test_large_message(const SSL_METHOD *smeth, 
        goto end;

    }



    testresult = 1;

    /*

     * Calling SSL_clear() first is not required but this tests that SSL_clear()

     * doesn't leak (when using enable-crypto-mdebug).

     */

    if (!SSL_clear(serverssl)) {

        printf("Unexpected failure from SSL_clear()\n");

        goto end;

    }



    testresult = 1;

 end:

    X509_free(chaincert);

    SSL_free(serverssl);