Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-18 09:10:38 +01:00
Code Releases Activity

station: Cancel ongoing scans in station_free

Browse Source 
Make scan.c forget station's scan callbacks to prevent crash when
switching interface types with a scan running.
This commit is contained in:
Andrew Zaborowski 2018-10-06 02:55:55 +02:00 committed by Denis Kenzior
parent 395acc8203
commit dc39c52525
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/station.c
View File

@ -62,6 +62,8 @@ struct station {
struct l_dbus_message *disconnect_pending; struct l_dbus_message *disconnect_pending;
struct l_dbus_message *scan_pending; struct l_dbus_message *scan_pending;
struct signal_agent *signal_agent; struct signal_agent *signal_agent;
uint32_t scan_id;
uint32_t hidden_network_scan_id;
/* Roaming related members */ /* Roaming related members */
struct timespec roam_min_time; struct timespec roam_min_time;
@ -591,6 +593,13 @@ static void periodic_scan_stop(struct station *station)
} }
} }
static void station_scan_destroy(void *userdata)
{
struct station *station = userdata;
station->scan_id = 0;
}
static const char *station_state_to_string(enum station_state state) static const char *station_state_to_string(enum station_state state)
{ {
switch (state) { switch (state) {
@ -1718,6 +1727,13 @@ next:
return true; return true;
} }
static void station_hidden_network_scan_destroy(void *userdata)
{
struct station *station = userdata;
station->hidden_network_scan_id = 0;
}
static struct l_dbus_message *station_dbus_connect_hidden_network( static struct l_dbus_message *station_dbus_connect_hidden_network(
struct l_dbus *dbus, struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
@ -1752,10 +1768,11 @@ static struct l_dbus_message *station_dbus_connect_hidden_network(
params.ssid = ssid; params.ssid = ssid;
if (!scan_active_full(index, &params, station->hidden_network_scan_id = scan_active_full(index, &params,
station_hidden_network_scan_triggered, station_hidden_network_scan_triggered,
station_hidden_network_scan_results, station_hidden_network_scan_results,
station, NULL)) station, station_hidden_network_scan_destroy);
if (!station->hidden_network_scan_id)
return dbus_error_failed(message); return dbus_error_failed(message);
station->connect_pending = l_dbus_message_ref(message); station->connect_pending = l_dbus_message_ref(message);
@ -1912,7 +1929,7 @@ static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
l_debug("Scan called from DBus"); l_debug("Scan called from DBus");
if (station->scan_pending) if (station->scan_id)
return dbus_error_busy(message); return dbus_error_busy(message);
/* /*
@ -1922,9 +1939,10 @@ static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
if (!station->connected_bss && if (!station->connected_bss &&
!(station->seen_hidden_networks && !(station->seen_hidden_networks &&
known_networks_has_hidden())) { known_networks_has_hidden())) {
if (!scan_passive(index, station_dbus_scan_triggered, station->scan_id = scan_passive(index,
new_scan_results, station, NULL)) station_dbus_scan_triggered,
return dbus_error_failed(message); new_scan_results, station,
station_scan_destroy);
} else { } else {
struct scan_parameters params; struct scan_parameters params;
@ -1934,12 +1952,15 @@ static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
if (!station->connected_bss) if (!station->connected_bss)
params.randomize_mac_addr_hint = true; params.randomize_mac_addr_hint = true;
if (!scan_active_full(index, &params, station->scan_id = scan_active_full(index, &params,
station_dbus_scan_triggered, station_dbus_scan_triggered,
new_scan_results, station, NULL)) new_scan_results, station,
return dbus_error_failed(message); station_scan_destroy);
} }
if (!station->scan_id)
return dbus_error_failed(message);
station->scan_pending = l_dbus_message_ref(message); station->scan_pending = l_dbus_message_ref(message);
return NULL; return NULL;
@ -2235,6 +2256,14 @@ static void station_free(struct station *station)
dbus_pending_reply(&station->scan_pending, dbus_pending_reply(&station->scan_pending,
dbus_error_aborted(station->scan_pending)); dbus_error_aborted(station->scan_pending));
if (station->scan_id)
scan_cancel(netdev_get_ifindex(station->netdev),
station->scan_id);
if (station->hidden_network_scan_id)
scan_cancel(netdev_get_ifindex(station->netdev),
station->hidden_network_scan_id);
l_timeout_remove(station->roam_trigger_timeout); l_timeout_remove(station->roam_trigger_timeout);
l_queue_destroy(station->networks_sorted, NULL); l_queue_destroy(station->networks_sorted, NULL);