station: fix crash with disconnect_onconnect
PATCH 1/1 station: fix crash with disconnect_onconnect
If the station has not associated yet netdev will not send a disconnect and end up calling the callback immediately. Station assumes the callback will happen asynchronously and does not set the required network/bss for __station_connect_network which results in a crash. The crash can be caused reliably with a simple script:
iwctl station wlan0 disconnect
iwctl station wlan0 connect <network1> &
sleep 0.02
iwctl station wlan0 connect <network2>
++++++++ backtrace ++++++++
0 0x7f4e1504e530 in /lib64/libc.so.6 1 0x432b54 in network_get_security() at src/network.c:253 2 0x416e92 in station_handshake_setup() at src/station.c:937 3 0x41a505 in __station_connect_network() at src/station.c:2551 4 0x41a683 in station_disconnect_onconnect_cb() at src/station.c:2581 5 0x40b4ae in netdev_disconnect() at src/netdev.c:3142 6 0x41a719 in station_disconnect_onconnect() at src/station.c:2603 7 0x41a89d in station_connect_network() at src/station.c:2652 8 0x433f1d in network_connect_psk() at src/network.c:886 9 0x43483a in network_connect() at src/network.c:1183
10 0x4add11 in _dbus_object_tree_dispatch() at ell/dbus-service.c:1802 11 0x49ff54 in message_read_handler() at ell/dbus.c:285
12 0x496d2f in io_callback() at ell/io.c:120
13 0x495894 in l_main_iterate() at ell/main.c:478
14 0x49599b in l_main_run() at ell/main.c:521
15 0x495cb3 in l_main_run_with_signal() at ell/main.c:647 16 0x404add in main() at src/main.c:490
17 0x7f4e15038b25 in /lib64/libc.so.6
To fix this move the disconnect call *after* the network/bss is set.
--- src/station.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
src/station.c +12 -7
@@ -2602,13 +2602,6 @@ static void station_disconnect_onconnect(struct station *station, struct scan_bss *bss, struct l_dbus_message *message) { - if (netdev_disconnect(station->netdev, station_disconnect_onconnect_cb, - station) < 0) { -l_dbus_send (dbus_get_bus (), - dbus_error_from_errno(-EIO, message)); -return ; - } -if (station->netconfig)netconfig_reset (station->netconfig);
@@ -2620,6 +2613,18 @@ static void station_disconnect_onconnect(struct station *station, station->connect_pending_bss = bss; station->connect_pending =l_dbus_message_ref (message); + +if (netdev_disconnect (station->netdev, station_disconnect_onconnect_cb, + station) <0 ) { +l_dbus_send (dbus_get_bus (), +dbus_error_from_errno (-EIO , message)); +l_dbus_message_unref (station->connect_pending); + station->connect_pending =NULL ; + + station->connect_pending_network =NULL ; + station->connect_pending_bss =NULL ; +return ; + } } void station_connect_network(struct station *station, struct network *network,
Signature · 1 line
2.26.2
Quoted 32 lines · James Prestwood
If the station has not associated yet netdev will not send a disconnect and end up calling the callback immediately. Station assumes the callback will happen asynchronously and does not set the required network/bss for
__station_connect_networkwhich results in a crash. The crash can be caused reliably with a simple script:iwctl station wlan0 disconnect
iwctl station wlan0 connect <network1> &
sleep 0.02
iwctl station wlan0 connect <network2>++++++++ backtrace ++++++++
0 0x7f4e1504e530 in /lib64/libc.so.6 1 0x432b54 in network_get_security() at src/network.c:253 2 0x416e92 in station_handshake_setup() at src/station.c:937 3 0x41a505 in __station_connect_network() at src/station.c:2551 4 0x41a683 in station_disconnect_onconnect_cb() at src/station.c:2581 5 0x40b4ae in netdev_disconnect() at src/netdev.c:3142 6 0x41a719 in station_disconnect_onconnect() at src/station.c:2603 7 0x41a89d in station_connect_network() at src/station.c:2652 8 0x433f1d in network_connect_psk() at src/network.c:886 9 0x43483a in network_connect() at src/network.c:118310
0x4add11in_dbus_object_tree_dispatch()atell/dbus-service.c:1802110x49ff54inmessage_read_handler()atell/dbus.c:285
120x496d2finio_callback()atell/io.c:120
130x495894inl_main_iterate()atell/main.c:478
140x49599binl_main_run()atell/main.c:521
150x495cb3inl_main_run_with_signal()atell/main.c:647160x404addinmain()atsrc/main.c:490
170x7f4e15038b25in/lib64/libc.so.6
Quoted 2 lines
To fix this move the disconnect call *after* the network/bss is set.
This patch fixes the reported problem.
Thanks for the quick fix!