diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-21 16:12:58 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-21 16:21:02 +0100 |
| commit | f93fbc76ece73799c15da5b0993c4021e3abc07f (patch) | |
| tree | 994956faeca733b96f2343cfaffd0d829adf6e0d | |
| parent | 8406455b4d94324a77e81f2fc14110f335c3d1f4 (diff) | |
| download | NetworkManager-f93fbc76ece73799c15da5b0993c4021e3abc07f.tar.gz | |
device: avoid assertion in nm_device_get_supplicant_timeout() for Wi-Fi connection
... without 802-1x setting.
NetworkManager[27913]: <trace> [1487689965.7156] device[0x555555bc0060] (wlp3s0): powersave is set to 3
NetworkManager[27913]: <info> [1487689965.7156] Config: added 'ssid' value 'xxx'
NetworkManager[27913]: <info> [1487689965.7156] Config: added 'scan_ssid' value '1'
NetworkManager[27913]: <info> [1487689965.7156] Config: added 'bssid' value 'xxx'
NetworkManager[27913]: <info> [1487689965.7157] Config: added 'key_mgmt' value 'WPA-PSK'
NetworkManager[27913]: <info> [1487689965.7157] Config: added 'psk' value '<hidden>'
NetworkManager[27913]: <debug> [1487689965.7157] sup-iface[0x555555be0010,wlp3s0]: assoc[0x555555ebd800]: starting association...
NetworkManager[27913]: nm_device_get_supplicant_timeout: assertion 's_8021x' failed
(gdb) bt
...
#3 0x00007ffff4c70419 in g_return_if_fail_warning (log_domain=log_domain@entry=0x55555577610e "NetworkManager", pretty_function=pretty_function@entry=0x5555557725e0 <__func__.44436> "nm_device_get_supplicant_timeout", expression=expression@entry=0x5555557725bb "s_8021x") at gmessages.c:2536
#4 0x000055555568af3a in nm_device_get_supplicant_timeout (self=0x555555bc0060 [NMDeviceWifi]) at src/devices/nm-device.c:12963
#5 0x00007fffe88d7f1e in act_stage2_config (device=<optimized out>, reason=0x7fffffffe000) at src/devices/wifi/nm-device-wifi.c:2651
#6 0x00005555556879f1 in activate_stage2_device_config (self=0x555555bc0060 [NMDeviceWifi]) at src/devices/nm-device.c:4320
#7 0x000055555566876b in activation_source_handle_cb (self=self@entry=0x555555bc0060 [NMDeviceWifi], family=family@entry=2) at src/devices/nm-device.c:4060
#8 0x000055555566882e in activation_source_handle_cb4 (user_data=user_data@entry=0x555555bc0060) at src/devices/nm-device.c:3997
#9 0x00007ffff4c658e7 in g_idle_dispatch (source=0x555555e228c0, callback=0x555555668820 <activation_source_handle_cb4>, user_data=0x555555bc0060) at gmain.c:5545
#10 0x00007ffff4c68e52 in g_main_dispatch (context=0x555555a214d0) at gmain.c:3203
#11 0x00007ffff4c68e52 in g_main_context_dispatch (context=context@entry=0x555555a214d0) at gmain.c:3856
#12 0x00007ffff4c691d0 in g_main_context_iterate (context=0x555555a214d0, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at gmain.c:3929
#13 0x00007ffff4c694f2 in g_main_loop_run (loop=0x555555a1a750) at gmain.c:4125
#14 0x00005555555821fe in main (argc=<optimized out>, argv=<optimized out>) at src/main.c:423
Fixes: 07570e245ac97054027acd928ed09ae2b83e62b0
| -rw-r--r-- | src/devices/nm-device.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index eceb5c383a..006e523641 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12960,11 +12960,11 @@ nm_device_get_supplicant_timeout (NMDevice *self) connection = nm_device_get_applied_connection (self); g_return_val_if_fail (connection, SUPPLICANT_DEFAULT_TIMEOUT); s_8021x = nm_connection_get_setting_802_1x (connection); - g_return_val_if_fail (s_8021x, SUPPLICANT_DEFAULT_TIMEOUT); - - timeout = nm_setting_802_1x_get_auth_timeout (s_8021x); - if (timeout > 0) - return timeout; + if (s_8021x) { + timeout = nm_setting_802_1x_get_auth_timeout (s_8021x); + if (timeout > 0) + return timeout; + } value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, "802-1x.auth-timeout", |