2ac791e87d
Manually refreshed: 140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch 601-ucode_support.patch Fixed in upstream: 804-hostapd-revert-ACS-Validate-6-GHz-AP-criteria-before.patch [1] Automatically rebased all other patches. [1] https://w1.fi/cgit/hostap/commit/?id=0b60826a66885bffa2fd709ed5e48cd5fe241b6b Signed-off-by: Agustin Lorenzo <agustin.lorenzo@thinco.es> Signed-off-by: Felix Fietkau <nbd@nbd.name>
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Tue, 25 May 2021 10:50:16 +0200
|
|
Subject: [PATCH] fix adding back stations after a missed deauth/disassoc
|
|
|
|
--- a/src/ap/ieee802_11.c
|
|
+++ b/src/ap/ieee802_11.c
|
|
@@ -5076,6 +5076,13 @@ static int add_associated_sta(struct hos
|
|
* drivers to accept the STA parameter configuration. Since this is
|
|
* after a new FT-over-DS exchange, a new TK has been derived, so key
|
|
* reinstallation is not a concern for this case.
|
|
+ *
|
|
+ * If the STA was associated and authorized earlier, but came for a new
|
|
+ * connection (!added_unassoc + !reassoc), remove the existing STA entry
|
|
+ * so that it can be re-added. This case is rarely seen when the AP could
|
|
+ * not receive the deauth/disassoc frame from the STA. And the STA comes
|
|
+ * back with new connection within a short period or before the inactive
|
|
+ * STA entry is removed from the list.
|
|
*/
|
|
wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
|
|
" (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
|
|
@@ -5089,7 +5096,8 @@ static int add_associated_sta(struct hos
|
|
(!(sta->flags & WLAN_STA_AUTHORIZED) ||
|
|
(reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
|
|
(!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&
|
|
- !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)))) {
|
|
+ !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)) ||
|
|
+ (!reassoc && (sta->flags & WLAN_STA_AUTHORIZED)))) {
|
|
hostapd_drv_sta_remove(hapd, sta->addr);
|
|
wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
|
|
set = 0;
|