commit b5f53b10393f73a1d66c5b08f51d0bbeb0b7bdc6
author Jaeden Amero <jaeden.amero@arm.com> Tue Apr 03 12:09:45 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Tue Apr 03 12:09:45 2018 +0100
tree 97a7ee8b4a638e0af7e39900511917f8923b7044
parent e7dc46240d9e4a1c38bad684a528f405b2c4984a
parent 29ed80f79ff5d0fa82a926f9b6d4966021ba06f8

Merge remote-tracking branch 'upstream-public/pr/1401' into mbedtls-2.7-proposed

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 236e52d..28905c9 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -2434,6 +2434,14 @@
             if( ret < 0 )
                 return( ret );
 
+            if ( (size_t)ret > len || ( INT_MAX > SIZE_MAX && ret > SIZE_MAX ) )
+            {
+                MBEDTLS_SSL_DEBUG_MSG( 1,
+                    ( "f_recv returned %d bytes but only %lu were requested",
+                    ret, (unsigned long)len ) );
+                return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+            }
+
             ssl->in_left += ret;
         }
     }
@@ -2481,6 +2489,14 @@
         if( ret <= 0 )
             return( ret );
 
+        if( (size_t)ret > ssl->out_left || ( INT_MAX > SIZE_MAX && ret > SIZE_MAX ) )
+        {
+            MBEDTLS_SSL_DEBUG_MSG( 1,
+                ( "f_send returned %d bytes but only %lu bytes were sent",
+                ret, (unsigned long)ssl->out_left ) );
+            return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+        }
+
         ssl->out_left -= ret;
     }