fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: detect FT support per interface and avoid enabling it

Browse source 
Previously we only cared whether supplicant is build with support for
FT. In that case we would pass FT-PSK to supplicant, like

  Config: added 'key_mgmt' value 'WPA-PSK WPA-PSK-SHA256 FT-PSK'

Supplicant would then always try FT with preference, regardless whether
the interface/driver support it. That results in a failure to associate, if
the driver does not support it.

  NetworkManager[1356]: <info>  [1566296144.9940] Config: added 'key_mgmt' value 'WPA-PSK WPA-PSK-SHA256 FT-PSK'
  ...
  wpa_supplicant[1348]: wlan0: WPA: AP key_mgmt 0x42 network profile key_mgmt 0x142; available key_mgmt 0x42
  wpa_supplicant[1348]: wlan0: WPA: using KEY_MGMT FT/PSK
  ...
  wpa_supplicant[1348]:   * akm=0xfac04
  ...
  kernel: ERROR @wl_set_key_mgmt :
  kernel: invalid cipher group (1027076)

Since we pass a list of acceptable "key_mgmt" options to supplicant,
FT-PSK should not be used when supplicant knows it's not supported.
That is a supplicant bug.

Regardless, work around it by checking the per-interface capability, and
avoid it if support is apparently not present.
This commit is contained in:
Thomas Haller 2019-08-20 15:50:32 +02:00
parent 0e1748afe1
commit 2f8a4e90f0
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/supplicant/nm-supplicant-interface.c
View file

@ -135,7 +135,8 @@ typedef struct {
NMSupplicantFeature p2p_support; NMSupplicantFeature p2p_support;
NMSupplicantFeature mesh_support; NMSupplicantFeature mesh_support;
NMSupplicantFeature wfd_support; NMSupplicantFeature wfd_support;
NMSupplicantFeature ft_support; NMSupplicantFeature ft_support_global;
NMSupplicantFeature ft_support_per_iface;
NMSupplicantFeature sha384_support; NMSupplicantFeature sha384_support;
guint32 max_scan_ssids; guint32 max_scan_ssids;
guint32 ready_count; guint32 ready_count;
@ -609,14 +610,25 @@ static void
parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities) parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities)
{ {
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
gboolean have_active = FALSE, have_p2p = FALSE, have_ssid = FALSE; gboolean have_active = FALSE;
gboolean have_ssid = FALSE;
gboolean have_p2p = FALSE;
gboolean have_ft = FALSE;
gint32 max_scan_ssids = -1; gint32 max_scan_ssids = -1;
const char **array; const char **array;
g_return_if_fail (capabilities && g_variant_is_of_type (capabilities, G_VARIANT_TYPE_VARDICT)); g_return_if_fail (capabilities && g_variant_is_of_type (capabilities, G_VARIANT_TYPE_VARDICT));
if ( g_variant_lookup (capabilities, "Modes", "^a&s", &array) if (g_variant_lookup (capabilities, "KeyMgmt", "^a&s", &array)) {
&& array) { have_ft = g_strv_contains (array, "wpa-ft-psk");
g_free (array);
}
priv->ft_support_per_iface = have_ft
? NM_SUPPLICANT_FEATURE_YES
: NM_SUPPLICANT_FEATURE_NO;
if (g_variant_lookup (capabilities, "Modes", "^a&s", &array)) {
if (g_strv_contains (array, "p2p")) if (g_strv_contains (array, "p2p"))
have_p2p = TRUE; have_p2p = TRUE;
g_free (array); g_free (array);
@ -627,8 +639,7 @@ parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities)
_notify (self, PROP_P2P_AVAILABLE); _notify (self, PROP_P2P_AVAILABLE);
} }
if ( g_variant_lookup (capabilities, "Scan", "^a&s", &array) if (g_variant_lookup (capabilities, "Scan", "^a&s", &array)) {
&& array) {
if (g_strv_contains (array, "active")) if (g_strv_contains (array, "active"))
have_active = TRUE; have_active = TRUE;
if (g_strv_contains (array, "ssid")) if (g_strv_contains (array, "ssid"))
@ -807,7 +818,13 @@ nm_supplicant_interface_get_wfd_support (NMSupplicantInterface *self)
NMSupplicantFeature NMSupplicantFeature
nm_supplicant_interface_get_ft_support (NMSupplicantInterface *self) nm_supplicant_interface_get_ft_support (NMSupplicantInterface *self)
{ {
return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->ft_support; NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
if (priv->ft_support_global == NM_SUPPLICANT_FEATURE_NO)
return NM_SUPPLICANT_FEATURE_NO;
if (priv->ft_support_per_iface != NM_SUPPLICANT_FEATURE_UNKNOWN)
return priv->ft_support_per_iface;
return priv->ft_support_global;
} }
NMSupplicantFeature NMSupplicantFeature
@ -889,7 +906,7 @@ nm_supplicant_interface_set_ft_support (NMSupplicantInterface *self,
{ {
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
priv->ft_support = ft_support; priv->ft_support_global = ft_support;
} }
void void
@ -2801,7 +2818,7 @@ set_property (GObject *object,
break; break;
case PROP_FT_SUPPORT: case PROP_FT_SUPPORT:
/* construct-only */ /* construct-only */
priv->ft_support = g_value_get_int (value); priv->ft_support_global = g_value_get_int (value);
break; break;
case PROP_SHA384_SUPPORT: case PROP_SHA384_SUPPORT:
/* construct-only */ /* construct-only */