wifi: mac80211: accept probe response on link address as well

If a random MAC address is not requested during scan request, unicast probe
response frames are only accepted if the destination address matches the
interface address. This works fine for non-ML interfaces. However, with
MLO, the same interface can have multiple links, and a scan on a link would
be requested with the link address. In such cases, the probe response frame
gets dropped which is incorrect.

Therefore, add logic to check if any of the link addresses match the
destination address if the interface address does not match.

Signed-off-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Link: https://patch.msgid.link/20250516-bug_fix_mlo_scan-v2-2-12e59d9110ac@oss.qualcomm.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index cb707907188585d6874bf290874bdb0ca33bb399..7b8da40a912d020f229a74c67bd5a57fb513a72d 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -240,6 +240,9 @@ static bool ieee80211_scan_accept_presp(struct ieee80211_sub_if_data *sdata,
                                        struct ieee80211_channel *channel,
                                        u32 scan_flags, const u8 *da)
 {
+       struct ieee80211_link_data *link_sdata;
+       u8 link_id;
+
        if (!sdata)
                return false;
 
@@ -251,7 +254,20 @@ static bool ieee80211_scan_accept_presp(struct ieee80211_sub_if_data *sdata,
 
        if (scan_flags & NL80211_SCAN_FLAG_RANDOM_ADDR)
                return true;
-       return ether_addr_equal(da, sdata->vif.addr);
+
+       if (ether_addr_equal(da, sdata->vif.addr))
+               return true;
+
+       for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) {
+               link_sdata = rcu_dereference(sdata->link[link_id]);
+               if (!link_sdata)
+                       continue;
+
+               if (ether_addr_equal(da, link_sdata->conf->addr))
+                       return true;
+       }
+
+       return false;
 }
 
 void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb)