Commit 4e56cde1 authored Jul 31, 2020 by Jouni Malinen Committed by Johannes Berg Aug 03, 2020

mac80211: Handle special status codes in SAE commit



SAE authentication has been extended with H2E (IEEE 802.11 REVmd) and PK
(WFA) options. Those extensions use special status code values in the
SAE commit messages (Authentication frame with transaction sequence
number 1) to identify which extension is in use. mac80211 was
interpreting those new values as the AP denying authentication and that
resulted in failure to complete SAE authentication in some cases.

Fix this by adding exceptions for the new status code values 126 and
127.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Link: https://lore.kernel.org/r/20200731183830.18735-1-jouni@codeaurora.org


Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent bd0b33b2

include/linux/ieee80211.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2561,6 +2561,8 @@ enum ieee80211_statuscode {
		/* 802.11ai */
		WLAN_STATUS_FILS_AUTHENTICATION_FAILURE = 108,
		WLAN_STATUS_UNKNOWN_AUTHENTICATION_SERVER = 109,
		WLAN_STATUS_SAE_HASH_TO_ELEMENT = 126,
		WLAN_STATUS_SAE_PK = 127,
		};

net/mac80211/mlme.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2988,7 +2988,10 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
		cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len);

		if (auth_alg == WLAN_AUTH_SAE &&
		status_code == WLAN_STATUS_ANTI_CLOG_REQUIRED)
		(status_code == WLAN_STATUS_ANTI_CLOG_REQUIRED \|\|
		(auth_transaction == 1 &&
		(status_code == WLAN_STATUS_SAE_HASH_TO_ELEMENT \|\|
		status_code == WLAN_STATUS_SAE_PK))))
		return;

		sdata_info(sdata, "%pM denied authentication (status %d)\n",

Admin message