commit a67508e066ed19118363ef5ebbc9c30a426c724f
author Janos Follath <janos.follath@arm.com> Wed Jan 29 14:53:48 2020 +0000
committer Janos Follath <janos.follath@arm.com> Wed Jan 29 14:53:48 2020 +0000
tree 419883f8114fa38673d69e69af50a32469444f11
parent 130e1364393f92df5bd1377b9eeab4c388cf509b
parent 16ba09c6214bdabbc4904d60547bd35901c4abb2

Merge pull request #3002 from gilles-peskine-arm/coverity-20200115-2.7 into mbedtls-2.7

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c1affa6..2a993b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 Bugfix
    * Allow loading symlinked certificates. Fixes #3005. Reported and fixed
      by Jonathan Bennett <JBennett@incomsystems.biz> via #3008.
+   * Fix an unchecked call to mbedtls_md() in the x509write module.
 
 = mbed TLS 2.7.13 branch released 2020-01-15
 

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index bd39e4f..b410182 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -282,6 +282,10 @@
 
     *olen = 0;
     block_size = mbedtls_cipher_get_block_size( ctx );
+    if ( 0 == block_size )
+    {
+        return( MBEDTLS_ERR_CIPHER_INVALID_CONTEXT );
+    }
 
     if( ctx->cipher_info->mode == MBEDTLS_MODE_ECB )
     {
@@ -308,11 +312,6 @@
     }
 #endif
 
-    if ( 0 == block_size )
-    {
-        return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT;
-    }
-
     if( input == output &&
        ( ctx->unprocessed_len != 0 || ilen % block_size ) )
     {
@@ -371,11 +370,6 @@
          */
         if( 0 != ilen )
         {
-            if( 0 == block_size )
-            {
-                return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT;
-            }
-
             /* Encryption: only cache partial blocks
              * Decryption w/ padding: always keep at least one whole block
              * Decryption w/o padding: only cache partial blocks

library/x509write_csr.c

diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index d6e8c13..8582a8b 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -230,7 +230,9 @@
     /*
      * Prepare signature
      */
-    mbedtls_md( mbedtls_md_info_from_type( ctx->md_alg ), c, len, hash );
+    ret = mbedtls_md( mbedtls_md_info_from_type( ctx->md_alg ), c, len, hash );
+    if( ret != 0 )
+        return( ret );
 
     if( ( ret = mbedtls_pk_sign( ctx->key, ctx->md_alg, hash, 0, sig, &sig_len,
                                  f_rng, p_rng ) ) != 0 )

tests/suites/test_suite_mpi.function

diff --git a/tests/suites/test_suite_mpi.function b/tests/suites/test_suite_mpi.function
index 820cde2..f63f2e6 100644
--- a/tests/suites/test_suite_mpi.function
+++ b/tests/suites/test_suite_mpi.function
@@ -345,8 +345,8 @@
     TEST_ASSERT( mbedtls_mpi_read_string( &X, 16, input_X ) == 0 );
     TEST_ASSERT( mbedtls_mpi_read_string( &Y, 16, input_Y ) == 0 );
 
-    mbedtls_mpi_grow( &X, size_X );
-    mbedtls_mpi_grow( &Y, size_Y );
+    TEST_ASSERT( mbedtls_mpi_grow( &X, size_X ) == 0 );
+    TEST_ASSERT( mbedtls_mpi_grow( &Y, size_Y ) == 0 );
 
     TEST_ASSERT( mbedtls_mpi_lt_mpi_ct( &X, &Y, &ret ) == input_err );
     if( input_err == 0 )