From f45850c493485a8fdc7b29f78108640430dfa66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Wed, 18 Feb 2015 10:23:52 +0000
Subject: [PATCH] Fix the fix to ssl_set_psk()
- possible for the first malloc to fail and the second to succeed
- missing = NULL assignment
---
library/ssl_tls.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index cb8a7d99f..6c27dac0f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4052,26 +4052,23 @@ int ssl_set_psk( ssl_context *ssl, const unsigned char *psk, size_t psk_len,
if( psk_len > POLARSSL_PSK_MAX_LEN )
return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
- if( ssl->psk != NULL )
+ if( ssl->psk != NULL || ssl->psk_identity != NULL )
{
polarssl_free( ssl->psk );
polarssl_free( ssl->psk_identity );
}
- ssl->psk_len = psk_len;
- ssl->psk_identity_len = psk_identity_len;
-
- ssl->psk = polarssl_malloc( ssl->psk_len );
- ssl->psk_identity = polarssl_malloc( ssl->psk_identity_len );
-
- if( ssl->psk == NULL )
- return( POLARSSL_ERR_SSL_MALLOC_FAILED );
- if( ssl->psk_identity == NULL )
+ if( ( ssl->psk = polarssl_malloc( psk_len ) ) == NULL ||
+ ( ssl->psk_identity = polarssl_malloc( psk_identity_len ) ) == NULL )
{
polarssl_free( ssl->psk );
+ ssl->psk = NULL;
return( POLARSSL_ERR_SSL_MALLOC_FAILED );
}
+ ssl->psk_len = psk_len;
+ ssl->psk_identity_len = psk_identity_len;
+
memcpy( ssl->psk, psk, ssl->psk_len );
memcpy( ssl->psk_identity, psk_identity, ssl->psk_identity_len );