nl80211: Avoid NL80211_WPA_VERSION_3 on older kernel versions

NL80211_WPA_VERSION_3 was only added in kernel 5.2 so it should not be
set for older kernel versions.  There is no direct way to check if the
value is supported. However, we can use the new infrastructure to check
whether the kernel has the NL80211_ATTR_SAE_PASSWORD attribute. It is
related and was added at the same time.

Fixes: 6cc78b3945 ("nl80211: Set NL80211_WPA_VERSION_2 vs. _3 based on AKM")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Benjamin Berg 2024-01-17 20:04:28 +01:00 committed by Jouni Malinen
parent 71bcb97b8c
commit 5589d62c57

View file

@ -6854,7 +6854,13 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
if (params->wpa_proto & WPA_PROTO_WPA) if (params->wpa_proto & WPA_PROTO_WPA)
ver |= NL80211_WPA_VERSION_1; ver |= NL80211_WPA_VERSION_1;
if (params->wpa_proto & WPA_PROTO_RSN) { if (params->wpa_proto & WPA_PROTO_RSN) {
if (wpa_key_mgmt_sae(params->key_mgmt_suite)) /*
* NL80211_ATTR_SAE_PASSWORD is related and was added
* at the same time as NL80211_WPA_VERSION_3.
*/
if (nl80211_attr_supported(drv,
NL80211_ATTR_SAE_PASSWORD) &&
wpa_key_mgmt_sae(params->key_mgmt_suite))
ver |= NL80211_WPA_VERSION_3; ver |= NL80211_WPA_VERSION_3;
else else
ver |= NL80211_WPA_VERSION_2; ver |= NL80211_WPA_VERSION_2;