commit 73b183c3bb6e729bcd3b47804de52fdc9194940c
author Krzysztof Stachowiak <krzysztof.stachowiak@arm.com> Thu Apr 05 10:20:09 2018 +0200
committer Krzysztof Stachowiak <krzysztof.stachowiak@arm.com> Thu Apr 05 10:20:09 2018 +0200
tree b9841c28852921850fc62dee1e4ac1a473e53311
parent c0b13f7f0c845b1ef348dd82e0f5790e6c07ebc9

Add buffer size check before cert_type_len read

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index e4b2c99..84f2f3d 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2659,6 +2659,13 @@
     buf = ssl->in_msg;
 
     /* certificate_types */
+    if( ssl->in_hslen <= mbedtls_ssl_hs_hdr_len( ssl ) )
+    {
+        MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
+        mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
+                                        MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR );
+        return( MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST );
+    }
     cert_type_len = buf[mbedtls_ssl_hs_hdr_len( ssl )];
     n = cert_type_len;