From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Sat, 13 Feb 2016 18:01:14 +0000 (+0100)
Subject: Fix some malloc failure crashes on X509_STORE_CTX_set_ex_data
X-Git-Tag: OpenSSL_1_1_0-pre6~731
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a98810bfac37a77750592611bb9f5a22e4634692;p=oweals%2Fopenssl.git

Fix some malloc failure crashes on X509_STORE_CTX_set_ex_data

from BoringSSL 306ece31bcaaed49e0240a2e5555f8901ebb2d45

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f285fbe882..7481705ed0 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -409,7 +409,9 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk)
 
     /* Set suite B flags if needed */
     X509_STORE_CTX_set_flags(ctx, tls1_suiteb(s));
-    X509_STORE_CTX_set_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx(), s);
+    if (!X509_STORE_CTX_set_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx(), s)) {
+        goto end;
+    }
 
     /* Verify via DANE if enabled */
     if (DANETLS_ENABLED(&s->dane))