AP MLD: Prefer STA entry that has sta->wpa_sm initialized

This is needed to allow RSN operations, like PTK rekeying, to be
completed on the correct STA entry. The previous design worked by
accident since it was using the WLAN_STA_ASSOC flag and the code that
was supposed to set that flag did not work correctly and left it unset
for the interfaces that were not used for the initial 4-way handshake.
That needs to be fixed, so this search need to be extended to be able to
prefer the STA entry that has sta->wpa_sm set instead of just the
WLAN_STA_ASSOC flag.

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

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 210068a94d9baa402b18d3eb3186fa23c72a3d96..9878a79df95a6760f1574d99b7a34035969cbc86 100644 (file)
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -1811,14 +1811,15 @@ static int hostapd_event_new_sta(struct hostapd_data *hapd, const u8 *addr)
 
 
 static struct hostapd_data * hostapd_find_by_sta(struct hostapd_iface *iface,
-                                                const u8 *src)
+                                                const u8 *src, bool rsn)
 {
        struct sta_info *sta;
        unsigned int j;
 
        for (j = 0; j < iface->num_bss; j++) {
                sta = ap_get_sta(iface->bss[j], src);
-               if (sta && sta->flags & WLAN_STA_ASSOC)
+               if (sta && (sta->flags & WLAN_STA_ASSOC) &&
+                   (!rsn || sta->wpa_sm))
                        return iface->bss[j];
        }
 
@@ -1826,6 +1827,36 @@ static struct hostapd_data * hostapd_find_by_sta(struct hostapd_iface *iface,
 }
 
 
+#ifdef CONFIG_IEEE80211BE
+static bool search_mld_sta(struct hostapd_data **p_hapd, const u8 *src,
+                          bool rsn)
+{
+       struct hostapd_data *hapd = *p_hapd;
+       unsigned int i;
+
+       /* Search for STA on other MLO BSSs */
+       for (i = 0; i < hapd->iface->interfaces->count; i++) {
+               struct hostapd_iface *h =
+                       hapd->iface->interfaces->iface[i];
+               struct hostapd_data *h_hapd = h->bss[0];
+               struct hostapd_bss_config *hconf = h_hapd->conf;
+
+               if (!hconf->mld_ap ||
+                   hconf->mld_id != hapd->conf->mld_id)
+                       continue;
+
+               h_hapd = hostapd_find_by_sta(h, src, true);
+               if (h_hapd) {
+                       *p_hapd = h_hapd;
+                       return true;
+               }
+       }
+
+       return false;
+}
+#endif /* CONFIG_IEEE80211BE */
+
+
 static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
                                   const u8 *data, size_t data_len,
                                   enum frame_encryption encrypted,
@@ -1838,36 +1869,28 @@ static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
                struct hostapd_data *h_hapd;
 
                hapd = switch_link_hapd(hapd, link_id);
-               h_hapd = hostapd_find_by_sta(hapd->iface, src);
+               h_hapd = hostapd_find_by_sta(hapd->iface, src, true);
+               if (!h_hapd)
+                       h_hapd = hostapd_find_by_sta(orig_hapd->iface, src,
+                                                    true);
                if (!h_hapd)
-                       h_hapd = hostapd_find_by_sta(orig_hapd->iface, src);
+                       h_hapd = hostapd_find_by_sta(hapd->iface, src, false);
+               if (!h_hapd)
+                       h_hapd = hostapd_find_by_sta(orig_hapd->iface, src,
+                                                    false);
                if (h_hapd)
                        hapd = h_hapd;
        } else if (hapd->conf->mld_ap) {
-               unsigned int i;
-
-               /* Search for STA on other MLO BSSs */
-               for (i = 0; i < hapd->iface->interfaces->count; i++) {
-                       struct hostapd_iface *h =
-                               hapd->iface->interfaces->iface[i];
-                       struct hostapd_data *h_hapd = h->bss[0];
-                       struct hostapd_bss_config *hconf = h_hapd->conf;
+               bool found;
 
-                       if (!hconf->mld_ap ||
-                           hconf->mld_id != hapd->conf->mld_id)
-                               continue;
-
-                       h_hapd = hostapd_find_by_sta(h, src);
-                       if (h_hapd) {
-                               hapd = h_hapd;
-                               break;
-                       }
-               }
+               found = search_mld_sta(&hapd, src, true);
+               if (!found)
+                       search_mld_sta(&hapd, src, false);
        } else {
-               hapd = hostapd_find_by_sta(hapd->iface, src);
+               hapd = hostapd_find_by_sta(hapd->iface, src, false);
        }
 #else /* CONFIG_IEEE80211BE */
-       hapd = hostapd_find_by_sta(hapd->iface, src);
+       hapd = hostapd_find_by_sta(hapd->iface, src, false);
 #endif /* CONFIG_IEEE80211BE */
 
        if (!hapd) {