RRM: Don't request LCI and civic if not supported

Check that FTM responder capability bit in Extended Capabilities element
and LCI and Location Civic bits in RM Enabled capabilities element are
set before sending LCI and location civic request in neighbor report
request. If they are not set, don't include the corresponding
sub-elements in the neighbor report request. This change is according to
IEEE Std 802.11-2024, 11.10.10.2 (Requesting a neighbor report).

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-by: Peer, Ilan <ilan.peer@intel.com>

diff --git a/tests/hwsim/test_rrm.py b/tests/hwsim/test_rrm.py
index 9eddadcbddc72746742bf16c929f728584e25e78..db8d43cc2b2c08fbf6b90abf37098f95dd27e5ec 100644 (file)
--- a/tests/hwsim/test_rrm.py
+++ b/tests/hwsim/test_rrm.py
@@ -243,7 +243,8 @@ def test_rrm_neighbor_rep_req(dev, apdev):
 
     params = {"ssid": "test", "rnr": "1"}
     hostapd.add_ap(apdev[0], params)
-    params = {"ssid": "test2", "rrm_neighbor_report": "1", "rnr": "1"}
+    params = {"ssid": "test2", "rrm_neighbor_report": "1", "rnr": "1",
+              "ftm_responder": "1", "lci": lci, "civic": civic}
     hapd = hostapd.add_ap(apdev[1], params)
 
     bssid1 = apdev[1]['bssid']

diff --git a/wpa_supplicant/rrm.c b/wpa_supplicant/rrm.c
index d467ce6bf48230ed02461aab3f802882b4f0ece5..e3405137679653108ad9ba6711e08a98d47cac23 100644 (file)
--- a/wpa_supplicant/rrm.c
+++ b/wpa_supplicant/rrm.c
@@ -160,6 +160,7 @@ int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
        rrm_ie = wpa_bss_get_ie(wpa_s->current_bss,
                                WLAN_EID_RRM_ENABLED_CAPABILITIES);
        if (!rrm_ie || !(wpa_s->current_bss->caps & IEEE80211_CAP_RRM) ||
+           rrm_ie[1] < 1 ||
            !(rrm_ie[2] & WLAN_RRM_CAPS_NEIGHBOR_REPORT)) {
                wpa_dbg(wpa_s, MSG_DEBUG,
                        "RRM: No network support for Neighbor Report.");
@@ -188,6 +189,24 @@ int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
                (ssid ? wpa_ssid_txt(ssid->ssid, ssid->ssid_len) : ""),
                wpa_s->rrm.next_neighbor_rep_token);
 
+       /*
+        * According to IEEE Std 802.11-2024, 11.10.10.2 (Requesting a neighbor
+        * report) LCI and civic requests depend on FTM responder support.
+        */
+       if (lci || civic) {
+               const u8 *ext_capab;
+
+               ext_capab = wpa_bss_get_ie(wpa_s->current_bss,
+                                          WLAN_EID_EXT_CAPAB);
+               if (!ieee802_11_ext_capab(ext_capab,
+                                         WLAN_EXT_CAPAB_FTM_RESPONDER)) {
+                       wpa_printf(MSG_DEBUG,
+                                  "AP doesn't support FTM responder, can't request LCI and civic");
+                       lci = 0;
+                       civic = 0;
+               }
+       }
+
        wpabuf_put_u8(buf, WLAN_ACTION_RADIO_MEASUREMENT);
        wpabuf_put_u8(buf, WLAN_RRM_NEIGHBOR_REPORT_REQUEST);
        wpabuf_put_u8(buf, wpa_s->rrm.next_neighbor_rep_token);
@@ -197,7 +216,8 @@ int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
                wpabuf_put_data(buf, ssid->ssid, ssid->ssid_len);
        }
 
-       if (lci) {
+       if (lci && rrm_ie[1] >= 2 &&
+           (rrm_ie[3] & WLAN_RRM_CAPS_LCI_MEASUREMENT)) {
                /* IEEE Std 802.11-2024, 9.4.2.19 (Measurement Request element)
                 */
                wpabuf_put_u8(buf, WLAN_EID_MEASURE_REQUEST);
@@ -231,9 +251,12 @@ int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
                wpabuf_put_u8(buf, LCI_REQ_SUBELEM_MAX_AGE);
                wpabuf_put_u8(buf, 2);
                wpabuf_put_le16(buf, 0xffff);
+       } else if (lci) {
+               wpa_printf(MSG_DEBUG, "RRM: LCI request isn't supported by AP");
        }
 
-       if (civic) {
+       if (civic && rrm_ie[1] >= 5 &&
+           (rrm_ie[6] & WLAN_RRM_CAPS_CIVIC_LOCATION_MEASUREMENT)) {
                /* IEEE Std 802.11-2024, 9.4.2.19 (Measurement Request element)
                 */
                wpabuf_put_u8(buf, WLAN_EID_MEASURE_REQUEST);
@@ -263,6 +286,9 @@ int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
                 */
                wpabuf_put_le16(buf, 0);
                /* No optional subelements */
+       } else if (civic) {
+               wpa_printf(MSG_DEBUG,
+                          "RRM: Civic request isn't supported by AP");
        }
 
        wpa_s->rrm.next_neighbor_rep_token++;