Memory leak in state machine in error path
authorTodd Short <tshort@akamai.com>
Tue, 22 Dec 2015 16:49:36 +0000 (11:49 -0500)
committerMatt Caswell <matt@openssl.org>
Wed, 23 Dec 2015 13:33:28 +0000 (13:33 +0000)
When EC is disabled, and an error occurs in ssl_generate_master_secret()
or RAND_bytes(), the error path does not free rsa_decrypt.

RT#4197

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
ssl/statem/statem_srvr.c

index 0e6f0d0..79254b5 100644 (file)
@@ -2620,8 +2620,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
 #endif
 #ifndef OPENSSL_NO_EC
     EVP_PKEY_free(ckey);
-    OPENSSL_free(rsa_decrypt);
 #endif
+    OPENSSL_free(rsa_decrypt);
 #ifndef OPENSSL_NO_PSK
     OPENSSL_clear_free(s->s3->tmp.psk, s->s3->tmp.psklen);
     s->s3->tmp.psk = NULL;