Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 02:19:26 +01:00
Code Releases Activity

station: move filtering of non-utf8 scan_bss entries

Browse Source 
Instead of silently ignoring entries with non-utf8 SSIDs, drop them from
the new_bss_list entirely.
This commit is contained in:
Denis Kenzior 2021-02-03 11:47:01 -06:00
parent 454cee12d4
commit 8fd6985214
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/station.c
View File

@ -330,11 +330,6 @@ static struct network *station_add_seen_bss(struct station *station,
return NULL; return NULL;
} }
if (!util_ssid_is_utf8(bss->ssid_len, bss->ssid)) {
l_debug("Ignoring BSS with non-UTF8 SSID");
return NULL;
}
memcpy(ssid, bss->ssid, bss->ssid_len); memcpy(ssid, bss->ssid, bss->ssid_len);
ssid[bss->ssid_len] = '\0'; ssid[bss->ssid_len] = '\0';
@ -614,6 +609,22 @@ static bool station_start_anqp(struct station *station, struct network *network,
return true; return true;
} }
static bool bss_free_if_ssid_not_utf8(void *data, void *user_data)
{
struct scan_bss *bss = data;
if (util_ssid_is_hidden(bss->ssid_len, bss->ssid))
return false;
if (util_ssid_is_utf8(bss->ssid_len, bss->ssid))
return false;
l_debug("Dropping scan_bss '%s', with non-utf8 SSID",
util_address_to_string(bss->addr));
bss_free(bss);
return true;
}
/* /*
* Used when scan results were obtained; either from scan running * Used when scan results were obtained; either from scan running
* inside station module or scans running in other state machines, e.g. wsc * inside station module or scans running in other state machines, e.g. wsc
@ -627,6 +638,8 @@ void station_set_scan_results(struct station *station,
struct network *network; struct network *network;
bool wait_for_anqp = false; bool wait_for_anqp = false;
l_queue_foreach_remove(new_bss_list, bss_free_if_ssid_not_utf8, NULL);
while ((network = l_queue_pop_head(station->networks_sorted))) while ((network = l_queue_pop_head(station->networks_sorted)))
network_bss_list_clear(network); network_bss_list_clear(network);