commit 6b7b35b12759373a44a208cdba874421743b7d9e
author Jaeden Amero <jaeden.amero@arm.com> Fri Aug 17 15:31:51 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Fri Aug 17 15:31:51 2018 +0100
tree 5d8252f7770bccdca769c84a22fd5207fad93beb
parent b4d3c5ad117b8589818e7c819337724e7cece0ef
parent 4c01904819f44c85d4583e3a542b925420ea5a93

Merge remote-tracking branch 'upstream-public/pr/1952' into mbedtls-2.1

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3e144a7..8db46ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
    * Add ecc extensions only if an ecc based ciphersuite is used.
      This improves compliance to RFC 4492, and as a result, solves
      interoperability issues with BouncyCastle. Raised by milenamil in #1157.
+   * Fix potential use-after-free in mbedtls_ssl_get_max_frag_len()
+     and mbedtls_ssl_get_record_expansion() after a session reset. Fixes #1941.
 
 = mbed TLS 2.1.14 branch released 2018-07-25
 

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c7ccac4..3ab482f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5737,6 +5737,9 @@
     ssl->transform_in = NULL;
     ssl->transform_out = NULL;
 
+    ssl->session_in = NULL;
+    ssl->session_out = NULL;
+
     memset( ssl->out_buf, 0, MBEDTLS_SSL_BUFFER_LEN );
     if( partial == 0 )
         memset( ssl->in_buf, 0, MBEDTLS_SSL_BUFFER_LEN );
@@ -6451,14 +6454,14 @@
     size_t transform_expansion;
     const mbedtls_ssl_transform *transform = ssl->transform_out;
 
+    if( transform == NULL )
+        return( (int) mbedtls_ssl_hdr_len( ssl ) );
+
 #if defined(MBEDTLS_ZLIB_SUPPORT)
     if( ssl->session_out->compression != MBEDTLS_SSL_COMPRESS_NULL )
         return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
 #endif
 
-    if( transform == NULL )
-        return( (int) mbedtls_ssl_hdr_len( ssl ) );
-
     switch( mbedtls_cipher_get_cipher_mode( &transform->cipher_ctx_enc ) )
     {
         case MBEDTLS_MODE_GCM: