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

nl80211: Add missing WPA3-SAE auth_data in auth retry case

Browse source 
When wpa_supplicant sends NL80211_CMD_AUTHENTICATE to kernel, it is
possible that the cfg80211 in kernel has expired the BSS entry that
we are trying to auth with. Then cfg80211 will reject the auth cmd.
In this case, wpa_supplicant will trigger a single channel scan to
refresh cfg80211 BSS entry, and retry the auth when scan is finished.

When this case happens, wpa_supplicant makes a copy of auth params,
such as frequency, bssid, ssid, ie and so on. So when we retry auth,
the copy of these params will be used. The problem is, a param named
auth_data is missed when making the copy. The auth_data is used by
NL80211_ATTR_SAE_DATA which is a mandatory field for WPA3-SAE auth.
In WPA3-SAE case the auth retry will always fail because auth_data is
missing. This patch fixes the issue.

Signed-off-by: hongwang.li <hongwang.li@sonos.com>
This commit is contained in:
hongwang.li 2021-01-11 18:12:58 -08:00 committed by Jouni Malinen
parent 71718b628b
commit 41fae6e0bb
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/drivers/driver_nl80211.c
View file

@ -2975,6 +2975,7 @@ static void wpa_driver_nl80211_deinit(struct i802_bss *bss)
os_free(drv->filter_ssids); os_free(drv->filter_ssids);
os_free(drv->auth_ie); os_free(drv->auth_ie);
os_free(drv->auth_data);
if (drv->in_interface_list) if (drv->in_interface_list)
dl_list_del(&drv->list); dl_list_del(&drv->list);
@ -3628,6 +3629,16 @@ static void nl80211_copy_auth_params(struct wpa_driver_nl80211_data *drv,
} }
} }
os_free(drv->auth_data);
drv->auth_data = NULL;
drv->auth_data_len = 0;
if (params->auth_data) {
drv->auth_data = os_memdup(params->auth_data,
params->auth_data_len);
if (drv->auth_data)
drv->auth_data_len = params->auth_data_len;
}
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (params->wep_key[i] && params->wep_key_len[i] && if (params->wep_key[i] && params->wep_key_len[i] &&
params->wep_key_len[i] <= 16) { params->wep_key_len[i] <= 16) {
@ -3881,6 +3892,8 @@ int wpa_driver_nl80211_authenticate_retry(struct wpa_driver_nl80211_data *drv)
params.ie = drv->auth_ie; params.ie = drv->auth_ie;
params.ie_len = drv->auth_ie_len; params.ie_len = drv->auth_ie_len;
params.auth_data = drv->auth_data;
params.auth_data_len = drv->auth_data_len;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (drv->auth_wep_key_len[i]) { if (drv->auth_wep_key_len[i]) {

2
src/drivers/driver_nl80211.h
View file

@ -209,6 +209,8 @@ struct wpa_driver_nl80211_data {
int auth_alg; int auth_alg;
u8 *auth_ie; u8 *auth_ie;
size_t auth_ie_len; size_t auth_ie_len;
u8 *auth_data;
size_t auth_data_len;
u8 auth_wep_key[4][16]; u8 auth_wep_key[4][16];
size_t auth_wep_key_len[4]; size_t auth_wep_key_len[4];
int auth_wep_tx_keyidx; int auth_wep_tx_keyidx;