commit 5d9aa9a7caeeb457ecab9ef2c5625f63c5238a69
author Jouni Malinen <jouni@qca.qualcomm.com> Thu Oct 12 22:59:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 22:59:33 2017 +0000
tree a4604d3f2f6f1cbf9c99d5d70703dcb139efa295
parent 0261db291a46b21b557187e17368be5aabbe74ee
parent 08784152079ced0cfbf8d2cc0d6f7ccd24bb8145

Fix TK configuration to the driver in EAPOL-Key 3/4 retry case am: 244b71b994 am: 5268c91672
am: 0878415207

Change-Id: I538143dd0de2ffb2aaf911d185eb7c82f7f059f2

src/rsn_supp/wpa.c

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index faffe36..2d4d8b8 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -500,6 +500,7 @@
 		os_memset(buf, 0, sizeof(buf));
 	}
 	sm->tptk_set = 1;
+	sm->tk_to_set = 1;
 
 	kde = sm->assoc_wpa_ie;
 	kde_len = sm->assoc_wpa_ie_len;
@@ -605,6 +606,12 @@
 	const u8 *key_rsc;
 	u8 null_rsc[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
+	if (!sm->tk_to_set) {
+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
+			"WPA: Do not re-install same PTK to the driver");
+		return 0;
+	}
+
 	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
 		"WPA: Installing PTK to the driver");
 
@@ -643,6 +650,7 @@
 
 	/* TK is not needed anymore in supplicant */
 	os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
+	sm->tk_to_set = 0;
 
 	if (sm->wpa_ptk_rekey) {
 		eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);

src/rsn_supp/wpa_i.h

diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
index 965a9c1..939e0a9 100644
--- a/src/rsn_supp/wpa_i.h
+++ b/src/rsn_supp/wpa_i.h
@@ -24,6 +24,7 @@
 	struct wpa_ptk ptk, tptk;
 	int ptk_set, tptk_set;
 	unsigned int msg_3_of_4_ok:1;
+	unsigned int tk_to_set:1;
 	u8 snonce[WPA_NONCE_LEN];
 	u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
 	int renew_snonce;