MFC: Avoid unbounded memory growth in libssl, which can be triggered by a

TLS client repeatedly renegotiating and sending OCSP Status Request TLS
extensions.

1 files changed, 20 insertions, 9 deletions

diff --git a/src/lib/libssl/src/ssl/t1_lib.c b/src/lib/libssl/src/ssl/t1_lib.c
index f3522a02be..48a3c67503 100644
--- a/src/lib/libssl/src/ssl/t1_lib.c
+++ b/src/lib/libssl/src/ssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.85 2015/09/12 16:10:08 doug Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.85.2.1 2016/09/22 18:32:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1438,10 +1438,28 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
                                 /* Read in responder_id_list */
                                 n2s(data, dsize);
                                 size -= 2;
-                                if (dsize > size  ) {
+                                if (dsize > size) {
                                         *al = SSL_AD_DECODE_ERROR;
                                         return 0;
                                 }
+
+                                /*
+                                 * We remove any OCSP_RESPIDs from a
+                                 * previous handshake to prevent
+                                 * unbounded memory growth.
+                                 */
+                                sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,
+                                    OCSP_RESPID_free);
+                                s->tlsext_ocsp_ids = NULL;
+                                if (dsize > 0) {
+                                        s->tlsext_ocsp_ids =
+                                            sk_OCSP_RESPID_new_null();
+                                        if (s->tlsext_ocsp_ids == NULL) {
+                                                *al = SSL_AD_INTERNAL_ERROR;
+                                                return 0;
+                                        }
+                                }
+
                                 while (dsize > 0) {
                                         OCSP_RESPID *id;
                                         int idsize;
@@ -1469,13 +1487,6 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
                                                 *al = SSL_AD_DECODE_ERROR;
                                                 return 0;
                                         }
-                                        if (!s->tlsext_ocsp_ids &&
-                                            !(s->tlsext_ocsp_ids =
-                                            sk_OCSP_RESPID_new_null())) {
-                                                OCSP_RESPID_free(id);
-                                                *al = SSL_AD_INTERNAL_ERROR;
-                                                return 0;
-                                        }
                                         if (!sk_OCSP_RESPID_push(
                                             s->tlsext_ocsp_ids, id)) {
                                                 OCSP_RESPID_free(id);