netdev: avoid PMKSA for fullmac drivers
RFC 1/1 netdev: avoid PMKSA for fullmac drivers
The fullmac drivers need additional support to correctly work with PMKSA. This can be disabled via main.conf, but to avoid extra user configuration avoid the use of PMKSA for fullmac drivers automatically.
--- src/netdev.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
src/netdev.c +19 -3
@@ -1518,7 +1518,8 @@ static void try_handshake_complete(struct netdev_handshake_state *nhs)l_debug ("Invoking handshake_event()" ); -handshake_state_cache_pmksa (&nhs->super); +if (nhs->type !=CONNECTION_TYPE_FULLMAC ) +handshake_state_cache_pmksa (&nhs->super);if (handshake_event (&nhs->super,HANDSHAKE_EVENT_COMPLETE ))return ;
@@ -2455,6 +2456,19 @@ static void netdev_driver_connected(struct netdev *netdev)eapol_register (netdev->sm); } +static bool netdev_handshake_can_use_pmksa (struct netdev_handshake_state *nhs) +{ +/* +* Do not use PMKSA if this is a fullmac driver as they need additional +* support (SET_PMKSA) in order to function properly. Until this support +* is added fullmac drivers will not utilize PMKSA. +*/ +if (nhs->type ==CONNECTION_TYPE_FULLMAC ) +return false; + +return nhs->super.have_pmksa; +} +static struct l_genl_msg *netdev_build_cmd_connect (struct netdev *netdev,struct handshake_state *hs,const uint8_t *prev_bssid)
@@ -2473,7 +2487,8 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,* 0 (open) for FT Initial Mobility Domain Association over * PMKSA caching */ -uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) && !hs->have_pmksa ? +uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) && + !netdev_handshake_can_use_pmksa (nhs) ?NL80211_AUTHTYPE_SAE :NL80211_AUTHTYPE_OPEN_SYSTEM ; enum mpdu_management_subtype subtype = prev_bssid ?
@@ -4053,7 +4068,8 @@ static void netdev_connect_common(struct netdev *netdev,* If SAE, and we have a valid PMKSA cache we can skip the entire SAE * protocol and authenticate using the cached keys. */ -if (IE_AKM_IS_SAE (hs->akm_suite) && hs->have_pmksa) { +if (IE_AKM_IS_SAE (hs->akm_suite) && +netdev_handshake_can_use_pmksa (nhs)) {l_debug ("Skipping SAE by using PMKSA cache" ); goto build_cmd_connect; }
Signature · 1 line
2.34.1
Dear James,
Am 28.01.25 um 19:04 schrieb James Prestwood:
Quoted 53 lines
The fullmac drivers need additional support to correctly work with PMKSA. This can be disabled via main.conf, but to avoid extra user configuration avoid the use of PMKSA for fullmac drivers automatically.
--- src/netdev.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)src/netdev.c +17
-2@@ -1518,7 +1518,8 @@ static void try_handshake_complete(struct netdev_handshake_state *nhs)l_debug ("Invoking handshake_event()" ); -handshake_state_cache_pmksa (&nhs->super); +if (nhs->type !=CONNECTION_TYPE_FULLMAC ) +handshake_state_cache_pmksa (&nhs->super);if (handshake_event (&nhs->super,HANDSHAKE_EVENT_COMPLETE ))return ;@@ -2455,6 +2456,19 @@ static void netdev_driver_connected(struct netdev *netdev)eapol_register (netdev->sm); } +static bool netdev_handshake_can_use_pmksa (struct netdev_handshake_state *nhs) +{ +/* +* Do not use PMKSA if this is a fullmac driver as they need additional +* support (SET_PMKSA) in order to function properly. Until this support +* is added fullmac drivers will not utilize PMKSA. +*/ +if (nhs->type ==CONNECTION_TYPE_FULLMAC ) +return false; + +return nhs->super.have_pmksa; +} +static struct l_genl_msg *netdev_build_cmd_connect (struct netdev *netdev,struct handshake_state *hs,const uint8_t *prev_bssid)@@ -2473,7 +2487,8 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,* 0 (open) for FT Initial Mobility Domain Association over * PMKSA caching */ -uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) && !hs->have_pmksa ? +uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) && + !netdev_handshake_can_use_pmksa (nhs) ?NL80211_AUTHTYPE_SAE :NL80211_AUTHTYPE_OPEN_SYSTEM ; enum mpdu_management_subtype subtype = prev_bssid ?
src/netdev.c static void netdev_connect_common(struct netdev *netdev, · line 4075
Quoted 9 lines
src/netdev.c +2
-1@@ -4053,7 +4068,8 @@ static void netdev_connect_common(struct netdev *netdev,* If SAE, and we have a valid PMKSA cache we can skip the entire SAE * protocol and authenticate using the cached keys. */ -if (IE_AKM_IS_SAE (hs->akm_suite) && hs->have_pmksa) { +if (IE_AKM_IS_SAE (hs->akm_suite) && +netdev_handshake_can_use_pmksa (nhs)) {l_debug ("Skipping SAE by using PMKSA cache" ); goto build_cmd_connect; }
I also still had problems with the brcmfmac driver and IWD. It was not finally resolved. I will try to check again with this patch.
I would really appreciate, if you could have 2-3 brcmfmac devices running in your testing environment.
Thanks,
Martin
Hi Martin,
Quoted 71 lines · Martin Petzold
Dear James,
Am 28.01.25 um 19:04 schrieb James Prestwood:
Quoted 64 lines
The fullmac drivers need additional support to correctly work with PMKSA. This can be disabled via main.conf, but to avoid extra user configuration avoid the use of PMKSA for fullmac drivers automatically.
---
src/netdev.c| 22 +++++++++++++++++++---1 file changed, 19 insertions(+), 3 deletions(-)src/netdev.c +5
-0@@ -1518,7 +1518,8 @@ static void try_handshake_complete(struct netdev_handshake_state *nhs) l_debug("Invoking handshake_event()"); - handshake_state_cache_pmksa(&nhs->super); + if (nhs->type != CONNECTION_TYPE_FULLMAC) + handshake_state_cache_pmksa(&nhs->super); if (handshake_event(&nhs->super, HANDSHAKE_EVENT_COMPLETE)) return;@@ -2455,6 +2456,19 @@ static void netdev_driver_connected(struct netdev *netdev) eapol_register(netdev->sm); } +static bool netdev_handshake_can_use_pmksa(struct netdev_handshake_state *nhs) +{ + /* +* Do not use PMKSA if this is a fullmac driver as they need additional
+ * support (SET_PMKSA) in order to function properly. Until this support
+ * is added fullmac drivers will not utilize PMKSA.
+ */
+ if (nhs->type==CONNECTION_TYPE_FULLMAC)
+ return false;src/netdev.c +4
-0+ + return nhs->super.have_pmksa; +} +static struct
l_genl_msg*netdev_build_cmd_connect(struct netdev *netdev, structhandshake_state*hs,
constuint8_t*prev_bssid)src/netdev.c +0
-1@@ -2473,7 +2487,8 @@ static struct l_genl_msg*netdev_build_cmd_connect(struct netdev *netdev, * 0 (open) for FT Initial Mobility Domain Association over * PMKSA caching */ - uint32_t auth_type = IE_AKM_IS_SAE(hs->akm_suite) &&!hs->have_pmksa ?
+uint32_tauth_type=IE_AKM_IS_SAE(hs->akm_suite)&& + !netdev_handshake_can_use_pmksa(nhs) ?NL80211_AUTHTYPE_SAE:
NL80211_AUTHTYPE_OPEN_SYSTEM; enummpdu_management_subtypesubtype =prev_bssid?src/netdev.c +2
-1@@ -4053,7 +4068,8 @@ static void netdev_connect_common(struct netdev*netdev, * If SAE, and we have a valid PMKSA cache we can skip the entire SAE * protocol and authenticate using the cached keys. */ - if (IE_AKM_IS_SAE(hs->akm_suite) && hs->have_pmksa) { + if (IE_AKM_IS_SAE(hs->akm_suite) && + netdev_handshake_can_use_pmksa(nhs)) { l_debug("Skipping SAE by using PMKSA cache"); goto build_cmd_connect;Quoted 1 line
}
I also still had problems with the brcmfmac driver and IWD. It was not finally resolved. I will try to check again with this patch.
Quoted 1 line
I would really appreciate, if you could have 2-3 brcmfmac devices running in your testing environment.
Happy to receive any brcmfmac devices you'd like to send my way ;)
Thanks,
James
Quoted 5 lines
Thanks,
Martin
tea
Quoted 79 lines · James Prestwood
Hi Martin,
Quoted 75 lines · Martin Petzold
Dear James,
Am 28.01.25 um 19:04 schrieb James Prestwood:
Quoted 62 lines
The fullmac drivers need additional support to correctly work with PMKSA. This can be disabled via main.conf, but to avoid extra user configuration avoid the use of PMKSA for fullmac drivers automatically.
--- src/netdev.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)src/netdev.c +5
-0@@ -1518,7 +1518,8 @@ static void try_handshake_complete(struct netdev_handshake_state *nhs) l_debug("Invoking handshake_event()"); -handshake_state_cache_pmksa (&nhs->super); +if (nhs->type !=CONNECTION_TYPE_FULLMAC ) +handshake_state_cache_pmksa (&nhs->super);if (handshake_event (&nhs->super,HANDSHAKE_EVENT_COMPLETE ))return ;@@ -2455,6 +2456,19 @@ static void netdev_driver_connected(struct netdev *netdev) eapol_register(netdev->sm); } +static bool netdev_handshake_can_use_pmksa(structnetdev_handshake_state *nhs) +{ +/* +* Do not use PMKSA if this is a fullmac driver as they need additional
+ * support (SET_PMKSA) in order to function properly. Until this
supportsrc/netdev.c +8
-0+* is added fullmac drivers will not utilize PMKSA. +*/ +if (nhs->type ==CONNECTION_TYPE_FULLMAC ) +return false; + +return nhs->super.have_pmksa; +} + static struct l_genl_msg *netdev_build_cmd_connect(struct netdev*netdev,
structhandshake_state*hs, constuint8_t*prev_bssid)src/netdev.c +0
-1@@ -2473,7 +2487,8 @@ static struct l_genl_msg*netdev_build_cmd_connect(struct netdev *netdev, * 0 (open) for FT Initial Mobility Domain Association over * PMKSA caching */ - uint32_t auth_type = IE_AKM_IS_SAE(hs->akm_suite) &&!hs->have_pmksa ?
src/netdev.c +2
-0+uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) && + !netdev_handshake_can_use_pmksa (nhs) ?NL80211_AUTHTYPE_SAE :NL80211_AUTHTYPE_OPEN_SYSTEM ; enum mpdu_management_subtype subtype = prev_bssid ?@@ -4053,7 +4068,8 @@ static void netdev_connect_common(struct netdev *netdev, * If SAE, and we have a valid PMKSA cache we can skip theentire SAE
* protocol and authenticate using the cached keys. */src/netdev.c static void netdev_connect_common(struct netdev *netdev, · line 4075
Quoted 6 lines
src/netdev.c +2
-1-if (IE_AKM_IS_SAE (hs->akm_suite) && hs->have_pmksa) { +if (IE_AKM_IS_SAE (hs->akm_suite) && +netdev_handshake_can_use_pmksa (nhs)) {l_debug ("Skipping SAE by using PMKSA cache" ); goto build_cmd_connect; }I also still had problems with the brcmfmac driver and IWD. It was not finally resolved. I will try to check again with this patch.
Quoted 16 lines
Quoted 2 lines
I would really appreciate, if you could have 2-3 brcmfmac devices running in your testing environment.
Happy to receive any brcmfmac devices you'd like to send my way ;)
Thanks,
James
Quoted 5 lines
Thanks,
Martin
tea
Actually, I'd be happier to not have any brcmfmac devices but here we are.