OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in ssl3_get_cert_verify.

Browse Source 
Any ssl3_get_* function that takes ownership of something before the
ssl_get_message call can't early-return without cleanup work.

This fixes valgrind on ClientAuth-Server-Async.

Change-Id: Ie7f0b37cac4d4bb7e06c00bae091fee0386c22da
Reviewed-on: https://boringssl-review.googlesource.com/1413
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin
2014-08-05 18:07:32 +00:00
committed by Adam Langley
parent 95fcaa4f4b
commit 734fca0890
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssl/s3_srvr.c
+9 -3
View File
@@ -2530,7 +2530,7 @@ int ssl3_get_cert_verify(SSL *s)
if (!(type & EVP_PKT_SIGN))
{
ret = 1;
goto end;
goto done_with_buffer;
}
n=s->method->ssl_get_message(s,
@@ -2540,7 +2540,11 @@ int ssl3_get_cert_verify(SSL *s)
SSL3_RT_MAX_PLAIN_LENGTH,
&ok);
if (!ok) return((int)n);
if (!ok)
{
ret = (int)n;
goto done;
}
CBS_init(&certificate_verify, s->init_msg, n);
@@ -2650,13 +2654,15 @@ int ssl3_get_cert_verify(SSL *s)
f_err:
ssl3_send_alert(s,SSL3_AL_FATAL,al);
}
end:
done_with_buffer:
/* There is no more need for the handshake buffer. */
if (s->s3->handshake_buffer)
{
BIO_free(s->s3->handshake_buffer);
s->s3->handshake_buffer = NULL;
s->s3->flags &= ~TLS1_FLAGS_KEEP_HANDSHAKE;
}
done:
EVP_MD_CTX_cleanup(&mctx);
EVP_PKEY_free(pkey);
return(ret);