DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Handle PMKSA flush in the driver for SAE/OWE offload cases

Browse source 
For wpa_supplicant based SAE/OWE connection, the wpa_supplicant state
machine is aware of the PMKID created for a connection and this gets
removed when "REMOVE_NETWORK all" is called. However, when SAE/OWE
offload is enabled, wpa_supplicant is not aware of the PMKID generated
by the driver/firmware. So add PMKSA del indication to the driver from
remove_network context so that the driver can free PMKs associated with
the SSID.

Signed-off-by: Vinayak Yadawad <vinayak.yadawad@broadcom.com>
This commit is contained in:
Vinayak Yadawad 2023-12-15 17:39:27 +05:30 committed by Jouni Malinen
parent 6a793c5f24
commit 1efdba5fdc
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wpa_supplicant/notify.c
View file

@ -404,8 +404,21 @@ void wpas_notify_network_removed(struct wpa_supplicant *wpa_s,
if (wpa_s->sme.ext_auth_wpa_ssid == ssid) if (wpa_s->sme.ext_auth_wpa_ssid == ssid)
wpa_s->sme.ext_auth_wpa_ssid = NULL; wpa_s->sme.ext_auth_wpa_ssid = NULL;
#endif /* CONFIG_SME && CONFIG_SAE */ #endif /* CONFIG_SME && CONFIG_SAE */
if (wpa_s->wpa) if (wpa_s->wpa) {
if ((wpa_key_mgmt_sae(ssid->key_mgmt) &&
(wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_SAE_OFFLOAD_STA)) ||
((ssid->key_mgmt & WPA_KEY_MGMT_OWE) &&
(wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA))) {
/* For cases when PMK is generated at the driver */
struct wpa_pmkid_params params;
os_memset(&params, 0, sizeof(params));
params.ssid = ssid->ssid;
params.ssid_len = ssid->ssid_len;
wpa_drv_remove_pmkid(wpa_s, &params);
}
wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid); wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid);
}
if (!ssid->p2p_group && wpa_s->global->p2p_group_formation != wpa_s && if (!ssid->p2p_group && wpa_s->global->p2p_group_formation != wpa_s &&
!wpa_s->p2p_mgmt) { !wpa_s->p2p_mgmt) {
wpas_dbus_unregister_network(wpa_s, ssid->id); wpas_dbus_unregister_network(wpa_s, ssid->id);

5
wpa_supplicant/wpa_supplicant.c
View file

@ -4751,6 +4751,11 @@ int wpa_supplicant_remove_all_networks(struct wpa_supplicant *wpa_s)
{ {
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
if (wpa_s->drv_flags2 &
(WPA_DRIVER_FLAGS2_SAE_OFFLOAD_STA |
WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA))
wpa_drv_flush_pmkid(wpa_s);
if (wpa_s->sched_scanning) if (wpa_s->sched_scanning)
wpa_supplicant_cancel_sched_scan(wpa_s); wpa_supplicant_cancel_sched_scan(wpa_s);