commit 9926eaf69525e13a08dbd26cb54b93cb142dc001
author Piotr Nowicki <piotr.nowicki@arm.com> Wed Nov 20 14:54:36 2019 +0100
committer Piotr Nowicki <piotr.nowicki@arm.com> Mon Nov 25 15:49:53 2019 +0100
tree 8629bf93fd8b586636ab2b5085440a497502863e
parent 5d74241b54632db5d0f71b05bf81a970be32af06

Do not allow configuring zero-length PSK

fix error when calloc is called with size 0

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 69a46b9..e450207 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -9171,8 +9171,13 @@
     ssl_conf_remove_psk( conf );
 
     /* Check and set raw PSK */
-    if( psk == NULL || psk_len > MBEDTLS_PSK_MAX_LEN )
+    if( psk == NULL )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
+    if( psk_len == 0 )
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
+    if( psk_len > MBEDTLS_PSK_MAX_LEN )
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
+
     if( ( conf->psk = mbedtls_calloc( 1, psk_len ) ) == NULL )
         return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
     conf->psk_len = psk_len;