From: Haim Dreyfuss <haim.dreyfuss@intel.com>
Date: Mon, 19 Jan 2015 01:44:37 +0000 (-0500)
Subject: eap_server: Avoid NULL pointer dereference in eap_fast_encrypt_phase2()
X-Git-Tag: hostap_2_4~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b760e64276d3f7ae8a707ee4ac9db005eb192617;p=thirdparty%2Fhostap.git

eap_server: Avoid NULL pointer dereference in eap_fast_encrypt_phase2()

If TLS encryption fails, encr may be NULL and that would have resulted
in NULL pointer dereference..

Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
---

diff --git a/src/eap_server/eap_server_fast.c b/src/eap_server/eap_server_fast.c
index 56ac7f43d..6745100d3 100644
--- a/src/eap_server/eap_server_fast.c
+++ b/src/eap_server/eap_server_fast.c
@@ -819,6 +819,9 @@ static int eap_fast_encrypt_phase2(struct eap_sm *sm,
 	encr = eap_server_tls_encrypt(sm, &data->ssl, plain);
 	wpabuf_free(plain);
 
+	if (!encr)
+		return -1;
+
 	if (data->ssl.tls_out && piggyback) {
 		wpa_printf(MSG_DEBUG, "EAP-FAST: Piggyback Phase 2 data "
 			   "(len=%d) with last Phase 1 Message (len=%d "