From: Jouni Malinen <j@w1.fi>
Date: Sun, 5 Feb 2017 12:38:07 +0000 (+0200)
Subject: FILS: Stop processing if fils_rmsk_to_pmk() fails
X-Git-Tag: hostap_2_7~1675
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=275cc942800eb22bd7a5a413ff016594ff404ef0;p=thirdparty%2Fhostap.git

FILS: Stop processing if fils_rmsk_to_pmk() fails

While the key derivation steps are not expected to fail, this was
already done on the AP side, so do the same in the STA side.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 88a66a51a..9c8ed6cb1 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -3439,6 +3439,8 @@ int fils_process_auth(struct wpa_sm *sm, const u8 *data, size_t len)
 				       sm->fils_nonce, sm->fils_anonce, NULL, 0,
 				       sm->pmk, &sm->pmk_len);
 		os_memset(rmsk, 0, sizeof(rmsk));
+		if (res)
+			return -1;
 
 		if (!sm->fils_erp_pmkid_set) {
 			wpa_printf(MSG_DEBUG, "FILS: PMKID not available");