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

netdev: add CONNECTION_TYPE_8021X_OFFLOAD

Browse Source 
This adds a new type for 8021x offload as well as support in
building CMD_CONNECT.

As described in the comment, 8021x offloading is not particularly
similar to PSK as far as the code flow in IWD is concerned. There
still needs to be an eapol_sm due to EAP being done in userspace.
This throws somewhat of a wrench into our 'is_offload' cases. And
as such this connection type is handled specially.
This commit is contained in:
James Prestwood 2021-04-09 09:14:45 -07:00 committed by Denis Kenzior
parent 93b49a72ac
commit 026ec40e1c
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/netdev.c
View File

@ -72,6 +72,7 @@ enum connection_type {
CONNECTION_TYPE_FULLMAC, CONNECTION_TYPE_FULLMAC,
CONNECTION_TYPE_SAE_OFFLOAD, CONNECTION_TYPE_SAE_OFFLOAD,
CONNECTION_TYPE_PSK_OFFLOAD, CONNECTION_TYPE_PSK_OFFLOAD,
CONNECTION_TYPE_8021X_OFFLOAD,
}; };
static uint32_t unicast_watch; static uint32_t unicast_watch;
@ -203,6 +204,15 @@ static inline bool is_offload(struct handshake_state *hs)
switch (nhs->type) { switch (nhs->type) {
case CONNECTION_TYPE_SOFTMAC: case CONNECTION_TYPE_SOFTMAC:
case CONNECTION_TYPE_FULLMAC: case CONNECTION_TYPE_FULLMAC:
/*
* 8021x offload does not quite fit into the same category of PSK
* offload. First the netdev_connect_event comes prior to EAP meaning
* the handshake is not done at this point. In addition it still
* requires EAP take place in userspace meaning IWD needs an eapol_sm.
* Because of this, and our prior use of 'is_offload', it does not fit
* into the same category and will need to be handled specially.
*/
case CONNECTION_TYPE_8021X_OFFLOAD:
return false; return false;
case CONNECTION_TYPE_SAE_OFFLOAD: case CONNECTION_TYPE_SAE_OFFLOAD:
case CONNECTION_TYPE_PSK_OFFLOAD: case CONNECTION_TYPE_PSK_OFFLOAD:
@ -2666,6 +2676,9 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,
case CONNECTION_TYPE_PSK_OFFLOAD: case CONNECTION_TYPE_PSK_OFFLOAD:
l_genl_msg_append_attr(msg, NL80211_ATTR_PMK, 32, hs->pmk); l_genl_msg_append_attr(msg, NL80211_ATTR_PMK, 32, hs->pmk);
break; break;
case CONNECTION_TYPE_8021X_OFFLOAD:
l_genl_msg_append_attr(msg, NL80211_ATTR_WANT_1X_4WAY_HS,
0, NULL);
} }
if (prev_bssid) if (prev_bssid)
@ -3045,13 +3058,21 @@ static int netdev_handshake_state_setup_connection_type(
if (wiphy_has_ext_feature(wiphy, if (wiphy_has_ext_feature(wiphy,
NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK)) NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK))
goto psk_offload; goto psk_offload;
/* fall through */
if (softmac)
goto softmac;
goto fullmac;
case IE_RSN_AKM_SUITE_8021X: case IE_RSN_AKM_SUITE_8021X:
case IE_RSN_AKM_SUITE_FT_OVER_8021X: case IE_RSN_AKM_SUITE_FT_OVER_8021X:
case IE_RSN_AKM_SUITE_8021X_SHA256: case IE_RSN_AKM_SUITE_8021X_SHA256:
case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA256: case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA256:
case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA384: case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA384:
case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384: case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384:
if (wiphy_has_ext_feature(wiphy,
NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X))
goto offload_1x;
if (softmac) if (softmac)
goto softmac; goto softmac;
@ -3096,6 +3117,9 @@ sae_offload:
psk_offload: psk_offload:
nhs->type = CONNECTION_TYPE_PSK_OFFLOAD; nhs->type = CONNECTION_TYPE_PSK_OFFLOAD;
return 0; return 0;
offload_1x:
nhs->type = CONNECTION_TYPE_8021X_OFFLOAD;
return 0;
} }
static int netdev_connect_common(struct netdev *netdev, static int netdev_connect_common(struct netdev *netdev,
@ -3181,8 +3205,12 @@ build_cmd_connect:
if (!cmd_connect) if (!cmd_connect)
return -EINVAL; return -EINVAL;
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);
if (nhs->type == CONNECTION_TYPE_8021X_OFFLOAD)
eapol_sm_set_require_handshake(sm, false);
}
} }
return netdev_connect_common(netdev, cmd_connect, bss, hs, sm, return netdev_connect_common(netdev, cmd_connect, bss, hs, sm,