commit 142ba736d900d854474cd9da9bdb81b707573bc2
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 23 14:43:30 2019 +0200
committer Jarno Lamsa <jarno.lamsa@arm.com> Fri Aug 23 13:11:31 2019 +0300
tree 6239530649a5aa0e07e7abce6946859bd83ab33e
parent 862b3196d6fc165116a0296c24bee0387933fbee

Re-use buffer allocated by handshake_init()

This fixes a memory leak as well (found by running ssl-opt.sh in an Asan
build).

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index a705648..8d75cf3 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -11612,13 +11612,12 @@
                   ( (size_t) p[3]       );
     p += 4;
 
-    ssl->session = mbedtls_calloc( 1, sizeof( mbedtls_ssl_session ) );
-    if( ssl->session == NULL )
-        return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
-    mbedtls_ssl_session_init( ssl->session );
-
+    /* This has been allocated by ssl_handshake_init(), called by
+     * by either ssl_session_reset_int() or mbedtls_ssl_setup(). */
+    ssl->session = ssl->session_negotiate;
     ssl->session_in = ssl->session;
     ssl->session_out = ssl->session;
+    ssl->session_negotiate = NULL;
 
     if( (size_t)( end - p ) < session_len )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
@@ -11633,14 +11632,12 @@
      * Transform
      */
 
-    /* Allocate and initialize structure */
-    ssl->transform = mbedtls_calloc( 1, sizeof( mbedtls_ssl_transform ) );
-    if( ssl->transform == NULL )
-        return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
-    mbedtls_ssl_transform_init( ssl->transform );
-
+    /* This has been allocated by ssl_handshake_init(), called by
+     * by either ssl_session_reset_int() or mbedtls_ssl_setup(). */
+    ssl->transform = ssl->transform_negotiate;
     ssl->transform_in = ssl->transform;
     ssl->transform_out = ssl->transform;
+    ssl->transform_negotiate = NULL;
 
     /* Read random bytes and populate structure */
     if( (size_t)( end - p ) < sizeof( ssl->transform->randbytes ) )