Skip to content

[PW_SID:1146634] wiphy: do not select FT AKMs if we are going to reject them later #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IWDTestBot wants to merge 1 commit into
base: workflow
Choose a base branch
from
Open

[PW_SID:1146634] wiphy: do not select FT AKMs if we are going to reject them later #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/netdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4079,6 +4079,13 @@ static int netdev_handshake_state_setup_connection_type(
/*
* Sanity check that any FT AKMs are set only on softmac or on
* devices that support firmware roam
*
* XXX: is this the right condition?
* This can be reworded as `IE_AKM_IS_FT() && !(softmac || canroam)`,
* i.e. allow if `softmac OR support roam offload`. Should we also
* check for SAE offload in the second arm, i.e. allow if
* `softmac OR (support roam offload AND support SAE offload)`?
* See comment in wiphy.c:wiphy_select_akm().
*/
if (L_WARN_ON(IE_AKM_IS_FT(hs->akm_suite) && !softmac && !canroam))
return -ENOTSUP;
Expand Down
20 changes: 16 additions & 4 deletions src/wiphy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
{
bool psk_offload = wiphy_has_ext_feature(wiphy,
NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK);
bool softmac = wiphy_supports_cmds_auth_assoc(wiphy);
bool roam_offload = wiphy_supports_firmware_roam(wiphy);

/*
* If FT is available, use FT authentication to keep the door open
Expand Down Expand Up @@ -339,8 +341,19 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
goto wpa2_personal;
}

if (info->akm_suites &
IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256)
/*
* XXX: this replicates the condition in netdev.c:netdev_handshake_state_setup_connection_type():
* `IE_AKM_IS_FT() && !softmac && !canroam` -> ENOTSUP.
* Thus, unlike condition for WPA2-FT below, we do not check for psk_offload.
*
* Should this instead be `softmac || (sae_offload && roam_offload)`?
*
* Or, conservatively, just `softmac` (like FT check for 802.1x above)?
* FT check for WPA2 below was loosened to allow offload in
* f5c5efa ("wiphy: allow FT AKM to be used if Auth/Assoc is not supported").
*/
if ((info->akm_suites & IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256) &&
(softmac || roam_offload))
return IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256;

if (info->akm_suites & IE_RSN_AKM_SUITE_SAE_SHA256)
Expand All @@ -355,8 +368,7 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
*/
if ((info->akm_suites & IE_RSN_AKM_SUITE_FT_USING_PSK) &&
bss->rsne && bss->mde_present) {
if (wiphy->support_cmds_auth_assoc ||
(psk_offload && wiphy->support_fw_roam))
if (softmac || (psk_offload && roam_offload))
return IE_RSN_AKM_SUITE_FT_USING_PSK;
}

Expand Down
Loading