From 40e26b2600ff2afcd417549194aa3393f6675763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 6 Jul 2021 12:05:23 +0200 Subject: [PATCH] Fix memory leak on failure path in test code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- programs/ssl/ssl_test_common_source.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/ssl/ssl_test_common_source.c b/programs/ssl/ssl_test_common_source.c index d9e36078db..a09e6ed195 100644 --- a/programs/ssl/ssl_test_common_source.c +++ b/programs/ssl/ssl_test_common_source.c @@ -185,7 +185,8 @@ int ssl_check_record( mbedtls_ssl_context const *ssl, if( ret != ret_repeated ) { mbedtls_printf( "mbedtls_ssl_check_record() returned inconsistent results.\n" ); - return( -1 ); + ret = -1; + goto cleanup; } switch( ret ) @@ -196,29 +197,34 @@ int ssl_check_record( mbedtls_ssl_context const *ssl, case MBEDTLS_ERR_SSL_INVALID_RECORD: if( opt.debug_level > 1 ) mbedtls_printf( "mbedtls_ssl_check_record() detected invalid record.\n" ); + ret = 0; break; case MBEDTLS_ERR_SSL_INVALID_MAC: if( opt.debug_level > 1 ) mbedtls_printf( "mbedtls_ssl_check_record() detected unauthentic record.\n" ); + ret = 0; break; case MBEDTLS_ERR_SSL_UNEXPECTED_RECORD: if( opt.debug_level > 1 ) mbedtls_printf( "mbedtls_ssl_check_record() detected unexpected record.\n" ); + ret = 0; break; default: mbedtls_printf( "mbedtls_ssl_check_record() failed fatally with -%#04x.\n", (unsigned int) -ret ); - return( -1 ); + ret = -1; + goto cleanup; } /* Regardless of the outcome, forward the record to the stack. */ } +cleanup: mbedtls_free( tmp_buf ); - return( 0 ); + return( ret ); } #endif /* MBEDTLS_SSL_RECORD_CHECKING */