From: David Benjamin <davidben@google.com>
Date: Mon, 14 Mar 2016 19:03:07 +0000 (-0400)
Subject: Fix memory leak on invalid CertificateRequest.
X-Git-Tag: OpenSSL_1_0_2h~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ec66c8c98881186abbb4a7ddd6617970f1ee27a7;p=oweals%2Fopenssl.git

Fix memory leak on invalid CertificateRequest.

Free up parsed X509_NAME structure if the CertificateRequest message
contains excess data.

The security impact is considered insignificant. This is a client side
only leak and a large number of connections to malicious servers would
be needed to have a significant impact.

This was found by libFuzzer.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 04cc9f54a9..19dc8648b9 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2199,6 +2199,7 @@ int ssl3_get_certificate_request(SSL *s)
             SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);
             goto err;
         }
+        xn = NULL;
 
         p += l;
         nc += l + 2;
@@ -2222,6 +2223,7 @@ int ssl3_get_certificate_request(SSL *s)
  err:
     s->state = SSL_ST_ERR;
  done:
+    X509_NAME_free(xn);
     if (ca_sk != NULL)
         sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
     return (ret);