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

netdev: Cancel ongoing rekey offload

Browse Source 
We need to cancel an ongoing rekey offload in a few additional places
besides the netdev destructor.
This commit is contained in:
Denis Kenzior 2018-10-20 10:38:56 -05:00
parent 8501b2edb1
commit ae538eae7d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/netdev.c
View File

@ -1027,11 +1027,18 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,
* 1. new_key(ptk) * 1. new_key(ptk)
* 2. new_key(gtk) [optional] * 2. new_key(gtk) [optional]
* 3. new_key(igtk) [optional] * 3. new_key(igtk) [optional]
* 4. set_station * 4. rekey offload [optional]
* 5. set_station
* *
* Cancel all pending commands, then de-authenticate * Cancel all pending commands, then de-authenticate
*/ */
netdev_handshake_state_cancel_all(nhs); netdev_handshake_state_cancel_all(nhs);
if (netdev->rekey_offload_cmd_id) {
l_genl_family_cancel(nl80211, netdev->rekey_offload_cmd_id);
netdev->rekey_offload_cmd_id = 0;
}
netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED; netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED;
handshake_event(&nhs->super, HANDSHAKE_EVENT_SETTING_KEYS_FAILED, NULL); handshake_event(&nhs->super, HANDSHAKE_EVENT_SETTING_KEYS_FAILED, NULL);
@ -2943,6 +2950,11 @@ int netdev_fast_transition(struct netdev *netdev, struct scan_bss *target_bss,
nhs->group_management_new_key_cmd_id = 0; nhs->group_management_new_key_cmd_id = 0;
} }
if (netdev->rekey_offload_cmd_id) {
l_genl_family_cancel(nl80211, netdev->rekey_offload_cmd_id);
netdev->rekey_offload_cmd_id = 0;
}
netdev_rssi_polling_update(netdev); netdev_rssi_polling_update(netdev);
return 0; return 0;