Fix potential stack overflow

This commit is contained in:
Manuel Pégourié-Gonnard 2014-11-12 01:25:31 +01:00
parent b134060f90
commit d681443f69
2 changed files with 30 additions and 23 deletions

View File

@ -4,10 +4,13 @@ PolarSSL ChangeLog (Sorted per branch, date)
Security Security
* Fix remotely-triggerable uninitialised pointer dereference caused by * Fix remotely-triggerable uninitialised pointer dereference caused by
crafted X.509 certificate (server is not affected if it doesn't ask for a crafted X.509 certificate (TLS server is not affected if it doesn't ask for a
client certificate) (found using Codenomicon Defensics). client certificate) (found using Codenomicon Defensics).
* Fix remotely-triggerable memory leak caused by crafted X.509 certificates * Fix remotely-triggerable memory leak caused by crafted X.509 certificates
(server is not affected if it doesn't ask for a client certificate) (TLS server is not affected if it doesn't ask for a client certificate)
(found using Codenomicon Defensics).
* Fix potential stack overflow while parsing crafted X.509 certificates
(TLS server is not affected if it doesn't ask for a client certificate)
(found using Codenomicon Defensics). (found using Codenomicon Defensics).
Features Features

View File

@ -421,6 +421,9 @@ int x509_get_name( unsigned char **p, const unsigned char *end,
size_t set_len; size_t set_len;
const unsigned char *end_set; const unsigned char *end_set;
/* don't use recursion, we'd risk stack overflow if not optimized */
while( 1 )
{
/* /*
* parse first SET, restricted to 1 element * parse first SET, restricted to 1 element
*/ */
@ -437,7 +440,7 @@ int x509_get_name( unsigned char **p, const unsigned char *end,
return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE ); return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE );
/* /*
* recurse until end of SEQUENCE is reached * continue until end of SEQUENCE is reached
*/ */
if( *p == end ) if( *p == end )
return( 0 ); return( 0 );
@ -449,7 +452,8 @@ int x509_get_name( unsigned char **p, const unsigned char *end,
memset( cur->next, 0, sizeof( x509_name ) ); memset( cur->next, 0, sizeof( x509_name ) );
return( x509_get_name( p, end, cur->next ) ); cur = cur->next;
}
} }
/* /*