yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-07 22:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4761 from mpg/fix-memleak-in-ssl-test-2.x

Browse source 
[backport 2.x] Fix memory leak on failure path in test code
This commit is contained in:
Manuel Pégourié-Gonnard 2021-07-08 12:34:30 +02:00 committed by GitHub
parent 008cd0c4d8 87e8b5ccaa
commit dcb3479701
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
programs/ssl/ssl_test_common_source.c
View file

@ -163,7 +163,7 @@ int dtls_srtp_key_derivation( void *p_expkey,
int ssl_check_record( mbedtls_ssl_context const *ssl, int ssl_check_record( mbedtls_ssl_context const *ssl,
unsigned char const *buf, size_t len ) unsigned char const *buf, size_t len )
{ {
int ret; int my_ret = 0, ret_cr1, ret_cr2;
unsigned char *tmp_buf; unsigned char *tmp_buf;
/* Record checking may modify the input buffer, /* Record checking may modify the input buffer,
@ -173,22 +173,21 @@ int ssl_check_record( mbedtls_ssl_context const *ssl,
return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
memcpy( tmp_buf, buf, len ); memcpy( tmp_buf, buf, len );
ret = mbedtls_ssl_check_record( ssl, tmp_buf, len ); ret_cr1 = mbedtls_ssl_check_record( ssl, tmp_buf, len );
if( ret != MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ) if( ret_cr1 != MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE )
{ {
int ret_repeated;
/* Test-only: Make sure that mbedtls_ssl_check_record() /* Test-only: Make sure that mbedtls_ssl_check_record()
* doesn't alter state. */ * doesn't alter state. */
memcpy( tmp_buf, buf, len ); /* Restore buffer */ memcpy( tmp_buf, buf, len ); /* Restore buffer */
ret_repeated = mbedtls_ssl_check_record( ssl, tmp_buf, len ); ret_cr2 = mbedtls_ssl_check_record( ssl, tmp_buf, len );
if( ret != ret_repeated ) if( ret_cr2 != ret_cr1 )
{ {
mbedtls_printf( "mbedtls_ssl_check_record() returned inconsistent results.\n" ); mbedtls_printf( "mbedtls_ssl_check_record() returned inconsistent results.\n" );
return( -1 ); my_ret = -1;
goto cleanup;
} }
switch( ret ) switch( ret_cr1 )
{ {
case 0: case 0:
break; break;
@ -209,16 +208,18 @@ int ssl_check_record( mbedtls_ssl_context const *ssl,
break; break;
default: default:
mbedtls_printf( "mbedtls_ssl_check_record() failed fatally with -%#04x.\n", (unsigned int) -ret ); mbedtls_printf( "mbedtls_ssl_check_record() failed fatally with -%#04x.\n", (unsigned int) -ret_cr1 );
return( -1 ); my_ret = -1;
goto cleanup;
} }
/* Regardless of the outcome, forward the record to the stack. */ /* Regardless of the outcome, forward the record to the stack. */
} }
cleanup:
mbedtls_free( tmp_buf ); mbedtls_free( tmp_buf );
return( 0 ); return( my_ret );
} }
#endif /* MBEDTLS_SSL_RECORD_CHECKING */ #endif /* MBEDTLS_SSL_RECORD_CHECKING */