Commit 5461707a authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: cfg80211: search all RNR elements for colocated APs 



An AP reporting colocated APs may send more than one reduced neighbor
report element. As such, iterate all elements instead of only parsing
the first one when looking for colocated APs.

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230618214436.ffe2c014f478.I372a4f96c88f7ea28ac39e94e0abfc465b5330d4@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8dcc91c4

net/wireless/scan.c

+63 −64
Original line number Diff line number Diff line
@@ -643,18 +643,15 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, 
	int n_coloc = 0, ret;

	LIST_HEAD(ap_list);



	elem = cfg80211_find_elem(WLAN_EID_REDUCED_NEIGHBOR_REPORT, ies->data,

				  ies->len);

	if (!elem)

		return 0;



	pos = elem->data;

	end = pos + elem->datalen;



	ret = cfg80211_calc_short_ssid(ies, &ssid_elem, &s_ssid_tmp);

	if (ret)

		return ret;



	for_each_element_id(elem, WLAN_EID_REDUCED_NEIGHBOR_REPORT,

			    ies->data, ies->len) {

		pos = elem->data;

		end = elem->data + elem->datalen;



		/* RNR IE may contain more than one NEIGHBOR_AP_INFO */

		while (pos + sizeof(*ap_info) <= end) {

			enum nl80211_band band;
@@ -672,7 +669,8 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, 
							       &band))

				break;



		freq = ieee80211_channel_to_frequency(ap_info->channel, band);

			freq = ieee80211_channel_to_frequency(ap_info->channel,

							      band);



			if (end - pos < count * length)

				break;
@@ -684,8 +682,7 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, 
				continue;

			}



		/*

		 * TBTT info must include bss param + BSSID +

			/* TBTT info must include bss param + BSSID +

			 * (short SSID or same_ssid bit to be set).

			 * ignore other options, and move to the

			 * next AP info
@@ -712,7 +709,8 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, 
				entry->center_freq = freq;



				if (!cfg80211_parse_ap_info(entry, pos, length,

						    ssid_elem, s_ssid_tmp)) {

							    ssid_elem,

							    s_ssid_tmp)) {

					n_coloc++;

					list_add_tail(&entry->list, &ap_list);

				} else {
@@ -728,6 +726,7 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, 
			cfg80211_free_coloc_ap_list(&ap_list);

			return 0;

		}

	}



	list_splice_tail(&ap_list, list);

	return n_coloc;