Split ap_sta_set_authorized() into two steps

This function is both updating the hostapd-internal sta->flags value and
sending out the AP-STA-CONNECTED control interface message. When
authorizing a STA, the call to this function is followed by a driver
command to update the flags of the STA entry in the driver. That has a
race condition at least for UML time-travel since the AP-STA-CONNECTED
event is used as a message to wait for before running a connectivity
test or some other operation that depends on the data connection being
in working condition.

Split the function into two steps so that the driver STA entry update
can be done between those two steps for the cases where it matters for
the race condition. In other words, send the AP-STA-CONNECTED message
only after having authorized the STA in the driver.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index b7b84cfd3e0b3c2c9b0c9235102ea7ff537eb1fd..ace0ce3d7225b5fe6b54a6b9065ffbc4ac282503 100644 (file)
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -52,6 +52,7 @@ void hostapd_notify_assoc_fils_finish(struct hostapd_data *hapd,
        struct ieee802_11_elems elems;
        u8 buf[IEEE80211_MAX_MMPDU_SIZE], *p = buf;
        int new_assoc;
+       bool updated;
 
        wpa_printf(MSG_DEBUG, "%s FILS: Finish association with " MACSTR,
                   __func__, MAC2STR(sta->addr));
@@ -76,11 +77,13 @@ void hostapd_notify_assoc_fils_finish(struct hostapd_data *hapd,
                                      sta->fils_pending_assoc_is_reassoc,
                                      WLAN_STATUS_SUCCESS,
                                      buf, p - buf);
-       ap_sta_set_authorized(hapd, sta, 1);
+       updated = ap_sta_set_authorized_flag(hapd, sta, 1);
        new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
        sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
        sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
        hostapd_set_sta_flags(hapd, sta);
+       if (updated)
+               ap_sta_set_authorized_event(hapd, sta, 1);
        wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FILS);
        ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
        hostapd_new_assoc_sta(hapd, sta, !new_assoc);
@@ -263,6 +266,7 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 #ifdef CONFIG_OWE
        struct hostapd_iface *iface = hapd->iface;
 #endif /* CONFIG_OWE */
+       bool updated = false;
 
        if (addr == NULL) {
                /*
@@ -845,7 +849,7 @@ skip_wpa_check:
            sta->auth_alg == WLAN_AUTH_FILS_SK ||
            sta->auth_alg == WLAN_AUTH_FILS_SK_PFS ||
            sta->auth_alg == WLAN_AUTH_FILS_PK)
-               ap_sta_set_authorized(hapd, sta, 1);
+               updated = ap_sta_set_authorized_flag(hapd, sta, 1);
 #else /* CONFIG_IEEE80211R_AP || CONFIG_FILS */
        /* Keep compiler silent about unused variables */
        if (status) {
@@ -857,6 +861,8 @@ skip_wpa_check:
        sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
 
        hostapd_set_sta_flags(hapd, sta);
+       if (updated)
+               ap_sta_set_authorized_event(hapd, sta, 1);
 
        if (reassoc && (sta->auth_alg == WLAN_AUTH_FT))
                wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FT);

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 8fb6ce5d3dcb6b4a27c7ce52396fd1c1e2545e44..a65287d77e1317f779d3c41eca6d4f2dbff0ccb1 100644 (file)
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -6374,6 +6374,8 @@ static void ieee80211_ml_link_sta_assoc_cb(struct hostapd_data *hapd,
                                           struct mld_link_info *link,
                                           bool ok)
 {
+       bool updated = false;
+
        if (!ok) {
                hostapd_logger(hapd, link->peer_addr, HOSTAPD_MODULE_IEEE80211,
                               HOSTAPD_LEVEL_DEBUG,
@@ -6394,9 +6396,11 @@ static void ieee80211_ml_link_sta_assoc_cb(struct hostapd_data *hapd,
        sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
 
        if (!hapd->conf->ieee802_1x && !hapd->conf->wpa)
-               ap_sta_set_authorized(hapd, sta, 1);
+               updated = ap_sta_set_authorized_flag(hapd, sta, 1);
 
        hostapd_set_sta_flags(hapd, sta);
+       if (updated)
+               ap_sta_set_authorized_event(hapd, sta, 1);
 
        /*
         * TODOs:

diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index 052231e34fb8d6857ea02a8d90ec09d3b0bf7416..f13c60a9ee1a0cec6abe6d6e19ed2eca9bcb5e08 100644 (file)
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -114,12 +114,15 @@ static void ieee802_1x_set_authorized(struct hostapd_data *hapd,
                                      bool authorized, bool mld)
 {
        int res;
+       bool update;
 
        if (sta->flags & WLAN_STA_PREAUTH)
                return;
 
-       ap_sta_set_authorized(hapd, sta, authorized);
+       update = ap_sta_set_authorized_flag(hapd, sta, authorized);
        res = hostapd_set_authorized(hapd, sta, authorized);
+       if (update)
+               ap_sta_set_authorized_event(hapd, sta, authorized);
        hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE8021X,
                       HOSTAPD_LEVEL_DEBUG, "%sauthorizing port",
                       authorized ? "" : "un");

diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index 4f84839e3c65c1d7265245e756d3eee8b7a666a1..1bd6c07e91af5aca33b3b2df69c99bb00efcb737 100644 (file)
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -1292,18 +1292,11 @@ const u8 * ap_sta_wpa_get_dpp_pkhash(struct hostapd_data *hapd,
 }
 
 
-void ap_sta_set_authorized(struct hostapd_data *hapd, struct sta_info *sta,
-                          int authorized)
+bool ap_sta_set_authorized_flag(struct hostapd_data *hapd, struct sta_info *sta,
+                               int authorized)
 {
-       const u8 *dev_addr = NULL;
-       char buf[100];
-#ifdef CONFIG_P2P
-       u8 addr[ETH_ALEN];
-       u8 ip_addr_buf[4];
-#endif /* CONFIG_P2P */
-
        if (!!authorized == !!(sta->flags & WLAN_STA_AUTHORIZED))
-               return;
+               return false;
 
        if (authorized) {
                int mld_assoc_link_id = -1;
@@ -1324,6 +1317,20 @@ void ap_sta_set_authorized(struct hostapd_data *hapd, struct sta_info *sta,
                sta->flags &= ~WLAN_STA_AUTHORIZED;
        }
 
+       return true;
+}
+
+
+void ap_sta_set_authorized_event(struct hostapd_data *hapd,
+                                struct sta_info *sta, int authorized)
+{
+       const u8 *dev_addr = NULL;
+       char buf[100];
+#ifdef CONFIG_P2P
+       u8 addr[ETH_ALEN];
+       u8 ip_addr_buf[4];
+#endif /* CONFIG_P2P */
+
 #ifdef CONFIG_P2P
        if (hapd->p2p_group == NULL) {
                if (sta->p2p_ie != NULL &&
@@ -1410,6 +1417,15 @@ void ap_sta_set_authorized(struct hostapd_data *hapd, struct sta_info *sta,
 }
 
 
+void ap_sta_set_authorized(struct hostapd_data *hapd, struct sta_info *sta,
+                          int authorized)
+{
+       if (!ap_sta_set_authorized_flag(hapd, sta, authorized))
+               return;
+       ap_sta_set_authorized_event(hapd, sta, authorized);
+}
+
+
 void ap_sta_disconnect(struct hostapd_data *hapd, struct sta_info *sta,
                       const u8 *addr, u16 reason)
 {

diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
index e2b9dde876792a506b14fdc561736936eb777fdb..64a1308ddff1dda510579981424f2978e734a2d0 100644 (file)
--- a/src/ap/sta_info.h
+++ b/src/ap/sta_info.h
@@ -393,6 +393,10 @@ const u8 * ap_sta_wpa_get_dpp_pkhash(struct hostapd_data *hapd,
 void ap_sta_disconnect(struct hostapd_data *hapd, struct sta_info *sta,
                       const u8 *addr, u16 reason);
 
+bool ap_sta_set_authorized_flag(struct hostapd_data *hapd, struct sta_info *sta,
+                               int authorized);
+void ap_sta_set_authorized_event(struct hostapd_data *hapd,
+                                struct sta_info *sta, int authorized);
 void ap_sta_set_authorized(struct hostapd_data *hapd,
                           struct sta_info *sta, int authorized);
 static inline int ap_sta_is_authorized(struct sta_info *sta)