mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
cd804c1ebb
Removed, merged upstream:
- 170-wpa_supplicant-fix-compiling-without-IEEE8021X_EAPOL.patch
Manually refreshed:
- 040-mesh-allow-processing-authentication-frames-in-block.patch
- 600-ubus_support.patch
- 761-shared_das_port.patch
Fixes: #12661
Fixes: 304423a4 ("hostapd: update to 2023-03-29")
Signed-off-by: Andre Heider <a.heider@gmail.com>
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
--- a/src/ap/ieee802_11.c
|
|
+++ b/src/ap/ieee802_11.c
|
|
@@ -4601,6 +4601,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)",
|
|
@@ -4614,7 +4621,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;
|