Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-09-14 22:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mbedtls-2.16-restricted' into mbedtls-2.16.12rc0-pr

Browse Source 
* mbedtls-2.16-restricted:
  Add changelog entry for session copy bugfix
  [session] fix a session copy bug fix a possible double reference on 'ticket' when peer_cert/peer_cert_digest calloc failed.
This commit is contained in:
Manuel Pégourié-Gonnard
2021-12-14 09:27:48 +01:00
parent 7b9cd91587 d4a3cbd773
commit fef64d5de9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.d/fix-session-copy-bug.txt
+6
View File
@@ -0,0 +1,6 @@
Bugfix
* Fix a double-free that happened after mbedtls_ssl_set_session() or
mbedtls_ssl_get_session() failed with MBEDTLS_ERR_SSL_ALLOC_FAILED
(out of memory). After that, calling mbedtls_ssl_session_free()
and mbedtls_ssl_free() would cause an internal session buffer to
be free()'d twice.
library/ssl_tls.c
+4
View File
@@ -301,6 +301,10 @@ static int ssl_session_copy( mbedtls_ssl_session *dst, const mbedtls_ssl_session
mbedtls_ssl_session_free( dst ); mbedtls_ssl_session_free( dst );
memcpy( dst, src, sizeof( mbedtls_ssl_session ) ); memcpy( dst, src, sizeof( mbedtls_ssl_session ) );
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_CLI_C)
dst->ticket = NULL;
#endif
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
if( src->peer_cert != NULL ) if( src->peer_cert != NULL )
{ {