Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

scan: Don't crash on external scans 

In the case of an external scan, we won't have a scan_request object,
sr.  Make sure to not crash in this case.

Also, since scan_request can no longer carry the frequency set in all
cases, add a new member to scan_results in order to do so.

Fixes: 27d8cf4ccc ("scan: track scanned frequencies for entire request")
This commit is contained in:
Denis Kenzior 2022-08-05 10:03:03 -05:00
parent 3d691038bc
commit 8c01edf74b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/scan.c
View File

@ -133,6 +133,7 @@ struct scan_results {
struct l_queue *bss_list; struct l_queue *bss_list;
uint64_t time_stamp; uint64_t time_stamp;
struct scan_request *sr; struct scan_request *sr;
struct scan_freq_set *freqs;
}; };
static bool start_next_scan_request(struct wiphy_radio_work_item *item); static bool start_next_scan_request(struct wiphy_radio_work_item *item);
@ -1828,12 +1829,14 @@ static void get_scan_done(void *user)
if (!results->sr || !results->sr->canceled) if (!results->sr || !results->sr->canceled)
scan_finished(sc, 0, results->bss_list, scan_finished(sc, 0, results->bss_list,
results->sr->freqs_scanned, results->freqs, results->sr);
results->sr);
else else
l_queue_destroy(results->bss_list, l_queue_destroy(results->bss_list,
(l_queue_destroy_func_t) scan_bss_free); (l_queue_destroy_func_t) scan_bss_free);
if (!results->sr)
scan_freq_set_free(results->freqs);
l_free(results); l_free(results);
} }
@ -1999,7 +2002,16 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
results->sr = sr; results->sr = sr;
results->bss_list = l_queue_new(); results->bss_list = l_queue_new();
scan_parse_result_frequencies(msg, sr->freqs_scanned); /*
* In case this was an external scan, setup a new, temporary
* frequency set to report the results to the periodic callback
*/
if (!results->sr)
results->freqs = scan_freq_set_new();
else
results->freqs = sr->freqs_scanned;
scan_parse_result_frequencies(msg, results->freqs);
scan_msg = l_genl_msg_new_sized(NL80211_CMD_GET_SCAN, 8); scan_msg = l_genl_msg_new_sized(NL80211_CMD_GET_SCAN, 8);
l_genl_msg_append_attr(scan_msg, NL80211_ATTR_WDEV, 8, l_genl_msg_append_attr(scan_msg, NL80211_ATTR_WDEV, 8,