From: Matt Caswell <matt@openssl.org>
Date: Tue, 11 Aug 2015 18:38:39 +0000 (+0100)
Subject: Fix "make test" seg fault with SCTP enabled
X-Git-Tag: OpenSSL_1_0_2e~140
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b12fa75c9df5c2c9c2f5094514323360c0af981;p=oweals%2Fopenssl.git

Fix "make test" seg fault with SCTP enabled

When config'd with "sctp" running "make test" causes a seg fault. This is
actually due to the way ssltest works - it dives under the covers and frees
up BIOs manually and so some BIOs are NULL when the SCTP code does not
expect it. The simplest fix is just to add some sanity checks to make sure
the BIOs aren't NULL before we use them.

This problem occurs in master and 1.0.2. The fix has also been applied to
1.0.1 to keep the code in sync.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit f75d5171be0b3b5419c8974133e1573cf976a8bb)
---

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index b4ee7abe27..c2c8d57e9d 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1370,9 +1370,12 @@ int dtls1_shutdown(SSL *s)
 {
     int ret;
 #ifndef OPENSSL_NO_SCTP
-    if (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&
+    BIO *wbio;
+
+    wbio = SSL_get_wbio(s);
+    if (wbio != NULL && BIO_dgram_is_sctp(wbio) &&
         !(s->shutdown & SSL_SENT_SHUTDOWN)) {
-        ret = BIO_dgram_sctp_wait_for_dry(SSL_get_wbio(s));
+        ret = BIO_dgram_sctp_wait_for_dry(wbio);
         if (ret < 0)
             return -1;