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

netdev: allow reassociation for auth-protos

Browse Source 
This adds support in netdev_reassociate for all the auth
protocols (SAE/FILS/OWE) by moving the bulk of netdev_connect
into netdev_connect_common. In addition PREV_BSSID is set
in the associate message if 'in_reassoc' is true.
This commit is contained in:
James Prestwood 2021-08-06 15:59:05 -07:00 committed by Denis Kenzior
parent da0fa4e012
commit 80fec3f5f4
1 changed files with 76 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/netdev.c
View File

@ -180,6 +180,7 @@ struct netdev {
bool aborting : 1; bool aborting : 1;
bool events_ready : 1; bool events_ready : 1;
bool retry_auth : 1; bool retry_auth : 1;
bool in_reassoc : 1;
}; };
struct netdev_preauth_state { struct netdev_preauth_state {
@ -780,6 +781,7 @@ static void netdev_connect_free(struct netdev *netdev)
netdev->result = NETDEV_RESULT_OK; netdev->result = NETDEV_RESULT_OK;
netdev->last_code = 0; netdev->last_code = 0;
netdev->in_ft = false; netdev->in_ft = false;
netdev->in_reassoc = false;
netdev->ignore_connect_event = false; netdev->ignore_connect_event = false;
netdev->expect_connect_failure = false; netdev->expect_connect_failure = false;
netdev->cur_rssi_low = false; netdev->cur_rssi_low = false;
@ -1122,7 +1124,7 @@ static void netdev_disconnect_event(struct l_genl_msg *msg,
l_debug(""); l_debug("");
if (!netdev->connected || netdev->disconnect_cmd_id > 0 || if (!netdev->connected || netdev->disconnect_cmd_id > 0 ||
netdev->in_ft) netdev->in_ft || netdev->in_reassoc)
return; return;
if (!l_genl_attr_init(&attr, msg)) { if (!l_genl_attr_init(&attr, msg)) {
@ -2559,6 +2561,7 @@ static void netdev_associate_event(struct l_genl_msg *msg,
false); false);
netdev->in_ft = false; netdev->in_ft = false;
netdev->in_reassoc = false;
netdev->associated = true; netdev->associated = true;
return; return;
} else if (ret == -EAGAIN) { } else if (ret == -EAGAIN) {
@ -2745,6 +2748,11 @@ static void netdev_sae_tx_associate(void *user_data)
l_genl_msg_append_attrv(msg, NL80211_ATTR_IE, iov, n_used); l_genl_msg_append_attrv(msg, NL80211_ATTR_IE, iov, n_used);
/* If doing a non-FT Reassociation */
if (netdev->in_reassoc)
l_genl_msg_append_attr(msg, NL80211_ATTR_PREV_BSSID, 6,
netdev->ap->prev_bssid);
if (!l_genl_family_send(nl80211, msg, netdev_assoc_cb, netdev, NULL)) { if (!l_genl_family_send(nl80211, msg, netdev_assoc_cb, netdev, NULL)) {
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED, netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED,
@ -2797,6 +2805,11 @@ static void netdev_owe_tx_associate(struct iovec *owe_iov, size_t n_owe_iov,
l_genl_msg_append_attrv(msg, NL80211_ATTR_IE, iov, c_iov); l_genl_msg_append_attrv(msg, NL80211_ATTR_IE, iov, c_iov);
/* If doing a non-FT Reassociation */
if (netdev->in_reassoc)
l_genl_msg_append_attr(msg, NL80211_ATTR_PREV_BSSID, 6,
netdev->ap->prev_bssid);
if (!l_genl_family_send(nl80211, msg, netdev_assoc_cb, if (!l_genl_family_send(nl80211, msg, netdev_assoc_cb,
netdev, NULL)) { netdev, NULL)) {
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
@ -2859,6 +2872,11 @@ static void netdev_fils_tx_associate(struct iovec *fils_iov, size_t n_fils_iov,
l_genl_msg_append_attr(msg, NL80211_ATTR_FILS_NONCES, l_genl_msg_append_attr(msg, NL80211_ATTR_FILS_NONCES,
nonces_len, nonces); nonces_len, nonces);
/* If doing a non-FT Reassociation */
if (netdev->in_reassoc)
l_genl_msg_append_attr(msg, NL80211_ATTR_PREV_BSSID, 6,
netdev->ap->prev_bssid);
if (!l_genl_family_send(nl80211, msg, netdev_assoc_cb, if (!l_genl_family_send(nl80211, msg, netdev_assoc_cb,
netdev, NULL)) { netdev, NULL)) {
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
@ -3424,57 +3442,21 @@ offload_1x:
return 0; return 0;
} }
static void netdev_connect_common(struct netdev *netdev, static int netdev_connect_common(struct netdev *netdev,
struct l_genl_msg *cmd_connect,
struct scan_bss *bss, struct scan_bss *bss,
struct scan_bss *prev_bss,
struct handshake_state *hs, struct handshake_state *hs,
struct eapol_sm *sm, const struct iovec *vendor_ies,
size_t num_vendor_ies,
netdev_event_func_t event_filter, netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data) netdev_connect_cb_t cb, void *user_data)
{
netdev->connect_cmd = cmd_connect;
netdev->event_filter = event_filter;
netdev->connect_cb = cb;
netdev->user_data = user_data;
netdev->handshake = hs;
netdev->sm = sm;
netdev->frequency = bss->frequency;
netdev->cur_rssi = bss->signal_strength / 100;
netdev_rssi_level_init(netdev);
netdev_cqm_rssi_update(netdev);
handshake_state_set_authenticator_address(hs, bss->addr);
if (!wiphy_has_ext_feature(netdev->wiphy,
NL80211_EXT_FEATURE_CAN_REPLACE_PTK0))
handshake_state_set_no_rekey(hs, true);
wiphy_radio_work_insert(netdev->wiphy, &netdev->work, 1,
&connect_work_ops);
}
int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
struct handshake_state *hs,
const struct iovec *vendor_ies,
size_t num_vendor_ies,
netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data)
{ {
struct netdev_handshake_state *nhs = l_container_of(hs, struct netdev_handshake_state *nhs = l_container_of(hs,
struct netdev_handshake_state, super); struct netdev_handshake_state, super);
struct l_genl_msg *cmd_connect = NULL; struct l_genl_msg *cmd_connect = NULL;
struct eapol_sm *sm = NULL; struct eapol_sm *sm = NULL;
bool is_rsn = hs->supplicant_ie != NULL; bool is_rsn = hs->supplicant_ie != NULL;
const uint8_t *prev_bssid = prev_bss ? prev_bss->addr : NULL;
if (!(netdev->ifi_flags & IFF_UP))
return -ENETDOWN;
if (netdev->type != NL80211_IFTYPE_STATION &&
netdev->type != NL80211_IFTYPE_P2P_CLIENT)
return -ENOTSUP;
if (netdev->connected || netdev->connect_cmd_id || netdev->work.id)
return -EISCONN;
if (!is_rsn) { if (!is_rsn) {
nhs->type = CONNECTION_TYPE_SOFTMAC; nhs->type = CONNECTION_TYPE_SOFTMAC;
@ -3522,7 +3504,7 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
default: default:
build_cmd_connect: build_cmd_connect:
cmd_connect = netdev_build_cmd_connect(netdev, bss, hs, cmd_connect = netdev_build_cmd_connect(netdev, bss, hs,
NULL, vendor_ies, num_vendor_ies); prev_bssid, vendor_ies, num_vendor_ies);
if (!is_offload(hs) && (is_rsn || hs->settings_8021x)) { if (!is_offload(hs) && (is_rsn || hs->settings_8021x)) {
sm = eapol_sm_new(hs); sm = eapol_sm_new(hs);
@ -3532,11 +3514,51 @@ build_cmd_connect:
} }
} }
netdev_connect_common(netdev, cmd_connect, bss, hs, sm, netdev->connect_cmd = cmd_connect;
event_filter, cb, user_data); netdev->event_filter = event_filter;
netdev->connect_cb = cb;
netdev->user_data = user_data;
netdev->handshake = hs;
netdev->sm = sm;
netdev->frequency = bss->frequency;
netdev->cur_rssi = bss->signal_strength / 100;
netdev_rssi_level_init(netdev);
netdev_cqm_rssi_update(netdev);
handshake_state_set_authenticator_address(hs, bss->addr);
if (!wiphy_has_ext_feature(netdev->wiphy,
NL80211_EXT_FEATURE_CAN_REPLACE_PTK0))
handshake_state_set_no_rekey(hs, true);
wiphy_radio_work_insert(netdev->wiphy, &netdev->work, 1,
&connect_work_ops);
return 0; return 0;
} }
int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
struct handshake_state *hs,
const struct iovec *vendor_ies,
size_t num_vendor_ies,
netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data)
{
if (!(netdev->ifi_flags & IFF_UP))
return -ENETDOWN;
if (netdev->type != NL80211_IFTYPE_STATION &&
netdev->type != NL80211_IFTYPE_P2P_CLIENT)
return -ENOTSUP;
if (netdev->connected || netdev->connect_cmd_id || netdev->work.id)
return -EISCONN;
return netdev_connect_common(netdev, bss, NULL, hs, vendor_ies,
num_vendor_ies, event_filter, cb,
user_data);
}
static void disconnect_idle(struct l_idle *idle, void *user_data) static void disconnect_idle(struct l_idle *idle, void *user_data)
{ {
struct netdev *netdev = user_data; struct netdev *netdev = user_data;
@ -3622,35 +3644,25 @@ int netdev_reassociate(struct netdev *netdev, struct scan_bss *target_bss,
netdev_event_func_t event_filter, netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data) netdev_connect_cb_t cb, void *user_data)
{ {
struct l_genl_msg *cmd_connect;
struct netdev_handshake_state;
struct handshake_state *old_hs; struct handshake_state *old_hs;
struct eapol_sm *sm = NULL, *old_sm; struct eapol_sm *old_sm;
bool is_rsn = hs->supplicant_ie != NULL; int ret;
if (netdev_handshake_state_setup_connection_type(hs) < 0)
return -ENOTSUP;
/* TODO: SoftMac SAE/FILS Re-Associations are not suppored yet */
if (L_WARN_ON(IE_AKM_IS_SAE(hs->akm_suite) ||
IE_AKM_IS_FILS(hs->akm_suite)))
return -ENOTSUP;
cmd_connect = netdev_build_cmd_connect(netdev, target_bss, hs,
orig_bss->addr, NULL, 0);
if (is_rsn)
sm = eapol_sm_new(hs);
old_sm = netdev->sm; old_sm = netdev->sm;
old_hs = netdev->handshake; old_hs = netdev->handshake;
netdev_connect_common(netdev, cmd_connect, target_bss, hs, sm, ret = netdev_connect_common(netdev, target_bss, orig_bss, hs, NULL, 0,
event_filter, cb, user_data); event_filter, cb, user_data);
if (ret < 0)
return ret;
if (netdev->ap)
memcpy(netdev->ap->prev_bssid, orig_bss->addr, ETH_ALEN);
netdev->associated = false; netdev->associated = false;
netdev->operational = false; netdev->operational = false;
netdev->connected = false; netdev->connected = false;
netdev->in_reassoc = true;
netdev_rssi_polling_update(netdev); netdev_rssi_polling_update(netdev);