commit 8b0910a7911f2e33d38c6c5a8652cef21dc3df6b
author Andrzej Kurek <andrzej.kurek@arm.com> Mon Nov 02 11:41:24 2020 +0100
committer GitHub <noreply@github.com> Mon Nov 02 11:41:24 2020 +0100
tree 3ebf8232c26bebea0970f91ab88f52306e550283
parent 938d4d3fa392671e9a5469e80efbd88cabdeb786
parent 28b3b29306fe9816041267628cb4e23d25b279a3

Merge pull request #3815 from AndrzejKurek/cipher-optim-mem-fix

ssl_tls.c: Fix unchecked memory allocation

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index eb212d2..24dbb7d 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1728,6 +1728,11 @@
     transform->key_enc = mbedtls_calloc( 1, cipher_info->key_bitlen >> 3 );
     transform->key_dec = mbedtls_calloc( 1, cipher_info->key_bitlen >> 3 );
 
+    if( transform->key_enc == NULL || transform->key_dec == NULL )
+    {
+        MBEDTLS_SSL_DEBUG_MSG( 1, ( "Failed to allocate cipher keys" ) );
+        return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+    }
     memcpy( transform->key_enc, key1, cipher_info->key_bitlen >> 3 );
     memcpy( transform->key_dec, key2, cipher_info->key_bitlen >> 3 );