From: Greg Kroah-Hartman Date: Sat, 5 Mar 2022 22:18:44 +0000 (+0100) Subject: fix up queue-5.10/mac80211-treat-some-sae-auth-steps-as-final.patch X-Git-Tag: v4.9.305~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54f828ad440a3cc53cc55c34fe1f3ebb807ca1fa;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-5.10/mac80211-treat-some-sae-auth-steps-as-final.patch --- diff --git a/queue-5.10/mac80211-treat-some-sae-auth-steps-as-final.patch b/queue-5.10/mac80211-treat-some-sae-auth-steps-as-final.patch index 3c5f794101d..1224f43c914 100644 --- a/queue-5.10/mac80211-treat-some-sae-auth-steps-as-final.patch +++ b/queue-5.10/mac80211-treat-some-sae-auth-steps-as-final.patch @@ -32,8 +32,8 @@ Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/ieee80211_i.h | 2 +- - net/mac80211/mlme.c | 15 +++++++++++---- - 2 files changed, 12 insertions(+), 5 deletions(-) + net/mac80211/mlme.c | 16 ++++++++++++---- + 2 files changed, 13 insertions(+), 5 deletions(-) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman #define IEEE80211_ASSOC_TIMEOUT (HZ / 5) #define IEEE80211_ASSOC_TIMEOUT_LONG (HZ / 2) #define IEEE80211_ASSOC_TIMEOUT_SHORT (HZ / 10) -@@ -2999,7 +3000,13 @@ static void ieee80211_rx_mgmt_auth(struc +@@ -2999,8 +3000,15 @@ static void ieee80211_rx_mgmt_auth(struc (status_code == WLAN_STATUS_ANTI_CLOG_REQUIRED || (auth_transaction == 1 && (status_code == WLAN_STATUS_SAE_HASH_TO_ELEMENT || @@ -69,9 +69,11 @@ Signed-off-by: Greg Kroah-Hartman + ifmgd->auth_data->timeout_started = true; + run_again(sdata, ifmgd->auth_data->timeout); return; ++ } sdata_info(sdata, "%pM denied authentication (status %d)\n", -@@ -4526,10 +4533,10 @@ void ieee80211_sta_work(struct ieee80211 + mgmt->sa, status_code); +@@ -4526,10 +4534,10 @@ void ieee80211_sta_work(struct ieee80211 if (ifmgd->auth_data && ifmgd->auth_data->timeout_started && time_after(jiffies, ifmgd->auth_data->timeout)) {