commit 57e1a9fdfc300927102006759550b8bc2a17ebde
author Krzysztof Stachowiak <krzysztof.stachowiak@arm.com> Thu Apr 05 10:20:09 2018 +0200
committer Krzysztof Stachowiak <krzysztof.stachowiak@arm.com> Tue Apr 10 13:35:09 2018 +0200
tree 966a155a1008ba3a0a32d107afe57d04fa96dd4c
parent 8fc134fcb114fd1c01873b6c409af1c02471f069

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 6e8e7e8..1fbc94d 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2456,6 +2456,13 @@
 
     // Retrieve cert 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;