commit fcd43c368f38ff760421a7018df843f37c173c30
author Jouni Malinen <jouni@qca.qualcomm.com> Thu Oct 12 22:52:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 22:52:01 2017 +0000
tree 26b260904df56b06631fe68e8be0844505a31179
parent e86c528b0a692723d308dbde3bb7e565b0d43bbf
parent 3843d1babeeba5b183c4564574464eee4a395621

Fix TK configuration to the driver in EAPOL-Key 3/4 retry case
am: 3843d1babe

Change-Id: Iea87d9a4969b180e703c48b4305343c0c0919c4f

src/rsn_supp/wpa.c

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index f0b964e..941402c 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -445,6 +445,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;
@@ -550,6 +551,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");
 
@@ -585,6 +592,7 @@
 			alg, keylen, MAC2STR(sm->bssid));
 		return -1;
 	}
+	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 322694d..17a2584 100644
--- a/src/rsn_supp/wpa_i.h
+++ b/src/rsn_supp/wpa_i.h
@@ -23,6 +23,7 @@
 	size_t pmk_len;
 	struct wpa_ptk ptk, tptk;
 	int ptk_set, tptk_set;
+	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;