ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-31 14:40:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pc_wifi_drv: only disable failed access-point

Browse Source 
The driver wrongfully disabled all APs if it was configured with an
auto-connect list containing multiple APs when one of those was
disabled as a result of using wrong credentials.

This commit changes the way network enable- and disablement are
handled by only operating on the given access-point in question.
It also removes unused code touched by these changes.

Thanks to Peter for bringing this problem to our attention.

Fixes #4517.
This commit is contained in:
Josef Söntgen 2022-05-20 13:43:04 +02:00 committed by Christian Helmuth
parent 03b2e3bda1
commit df5cadc8ad
1 changed files with 44 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
repos/pc/src/drivers/wifi/pc/frontend.h
View File

@ -563,7 +563,6 @@ struct Wifi::Frontend
REMOVE_NETWORK = 0x40|NETWORK, REMOVE_NETWORK = 0x40|NETWORK,
ENABLE_NETWORK = 0x50|NETWORK, ENABLE_NETWORK = 0x50|NETWORK,
DISABLE_NETWORK = 0x60|NETWORK, DISABLE_NETWORK = 0x60|NETWORK,
DISCONNECT_NETWORK = 0x70|NETWORK,
LIST_NETWORKS = 0x80|NETWORK, LIST_NETWORKS = 0x80|NETWORK,
CONNECTING = 0x00|CONNECT, CONNECTING = 0x00|CONNECT,
@ -866,70 +865,42 @@ struct Wifi::Frontend
_submit_cmd(Cmd_str("ADD_NETWORK")); _submit_cmd(Cmd_str("ADD_NETWORK"));
} }
void _network_enable() void _network_enable(Accesspoint &ap)
{ {
if (_state != State::IDLE) { if (_state != State::IDLE) {
Genode::warning("cannot enable network in non-idle state"); Genode::warning("cannot enable network in non-idle state");
return; return;
} }
if (_processed_ap) { return; } if (ap.enabled) { return; }
_aps.for_each([&] (Accesspoint &ap) {
if ( !_processed_ap && ap.valid()
&& !ap.enabled && ap.auto_connect) {
_processed_ap = ≈
}
});
if (!_processed_ap) {
return;
}
if (_verbose) { if (_verbose) {
Genode::log("Enable network: '", _processed_ap->ssid, "'"); Genode::log("Enable network: ", ap.id, " '", ap.ssid, "'");
} }
ap.enabled = true;
_state_transition(_state, State::ENABLE_NETWORK); _state_transition(_state, State::ENABLE_NETWORK);
_submit_cmd(Cmd_str("ENABLE_NETWORK ", _processed_ap->id)); _submit_cmd(Cmd_str("ENABLE_NETWORK ", ap.id));
} }
void _network_disable() void _network_disable(Accesspoint &ap)
{ {
if (_state != State::IDLE) { if (_state != State::IDLE) {
Genode::warning("cannot enable network in non-idle state"); Genode::warning("cannot enable network in non-idle state");
return; return;
} }
if (_processed_ap) { return; } if (!ap.enabled) { return; }
_aps.for_each([&] (Accesspoint &ap) {
if ( !_processed_ap && ap.valid()
&& ap.enabled && ap.auto_connect) {
_processed_ap = ≈
}
});
if (!_processed_ap) {
/* XXX move State transition somewhere more sane */
_state_transition(_state, State::IDLE);
_add_new_aps();
return;
}
if (_verbose) { if (_verbose) {
Genode::log("Disable network: '", _processed_ap->ssid, "'"); Genode::log("Disable network: ", ap.id, " '", ap.ssid, "'");
} }
_state_transition(_state, State::DISABLE_NETWORK); ap.enabled = false;
_submit_cmd(Cmd_str("DISABLE_NETWORK ", _processed_ap->id));
}
void _network_disconnect() _state_transition(_state, State::DISABLE_NETWORK);
{ _submit_cmd(Cmd_str("DISABLE_NETWORK ", ap.id));
_state_transition(_state, State::DISCONNECT_NETWORK);
_submit_cmd(Cmd_str("DISCONNECT"));
} }
void _network_set_ssid(char const *msg) void _network_set_ssid(char const *msg)
@ -1007,20 +978,25 @@ struct Wifi::Frontend
} }
break; break;
case State::REMOVE_NETWORK: case State::REMOVE_NETWORK:
{
_state_transition(_state, State::IDLE); _state_transition(_state, State::IDLE);
Accesspoint &ap = *_processed_ap;
/* reset processed AP as this is an end state */
_processed_ap = nullptr;
if (cmd_fail(msg)) { if (cmd_fail(msg)) {
Genode::error("could not remove network: ", msg); Genode::error("could not remove network: ", msg);
} else { } else {
_free_ap(*_processed_ap); _free_ap(ap);
/* trigger the next round */ /* trigger the next round */
_processed_ap = nullptr;
_remove_stale_aps(); _remove_stale_aps();
successfully = true; successfully = true;
} }
break; break;
}
case State::FILL_NETWORK_SSID: case State::FILL_NETWORK_SSID:
_state_transition(_state, State::IDLE); _state_transition(_state, State::IDLE);
@ -1049,8 +1025,11 @@ struct Wifi::Frontend
} }
break; break;
case State::FILL_NETWORK_PSK: case State::FILL_NETWORK_PSK:
{
_state_transition(_state, State::IDLE); _state_transition(_state, State::IDLE);
Accesspoint &ap = *_processed_ap;
if (!cmd_successful(msg)) { if (!cmd_successful(msg)) {
Genode::error("could not set passphrase for network: ", msg); Genode::error("could not set passphrase for network: ", msg);
} else { } else {
@ -1059,44 +1038,47 @@ struct Wifi::Frontend
* Disable network to trick wpa_supplicant into reloading * Disable network to trick wpa_supplicant into reloading
* the settings. * the settings.
*/ */
if (_processed_ap->update) { if (ap.update) {
_processed_ap->enabled = false; ap.enabled = true;
_network_disable(ap);
_state_transition(_state, State::DISABLE_NETWORK);
_submit_cmd(Cmd_str("DISABLE_NETWORK ", _processed_ap->id));
} else } else
if (_processed_ap->auto_connect) { if (ap.auto_connect) {
_network_enable(ap);
_state_transition(_state, State::ENABLE_NETWORK);
_submit_cmd(Cmd_str("ENABLE_NETWORK ", _processed_ap->id));
} else { } else {
/* trigger the next round */ /* trigger the next round */
_processed_ap = nullptr;
_add_new_aps(); _add_new_aps();
} }
successfully = true; successfully = true;
} }
break; break;
}
case State::ENABLE_NETWORK: case State::ENABLE_NETWORK:
{
_state_transition(_state, State::IDLE); _state_transition(_state, State::IDLE);
/* reset processed AP as this is an end state */
_processed_ap = nullptr;
if (!cmd_successful(msg)) { if (!cmd_successful(msg)) {
Genode::error("could not enable network: ", msg); Genode::error("could not enable network: ", msg);
} else { } else {
_processed_ap->enabled = true;
/* trigger the next round */ /* trigger the next round */
_processed_ap = nullptr;
_add_new_aps(); _add_new_aps();
successfully = true; successfully = true;
} }
break; break;
}
case State::DISABLE_NETWORK: case State::DISABLE_NETWORK:
{
_state_transition(_state, State::IDLE); _state_transition(_state, State::IDLE);
Accesspoint &ap = *_processed_ap;
/* reset processed AP as this is an end state */
_processed_ap = nullptr;
if (!cmd_successful(msg)) { if (!cmd_successful(msg)) {
Genode::error("could not disable network: ", msg); Genode::error("could not disable network: ", msg);
} else { } else {
@ -1105,35 +1087,18 @@ struct Wifi::Frontend
* Updated settings are applied, enable the network * Updated settings are applied, enable the network
* anew an try again. * anew an try again.
*/ */
if (_processed_ap->update) { if (ap.update) {
_processed_ap->update = false; ap.update = false;
if (_processed_ap->auto_connect) { if (ap.auto_connect) {
_state_transition(_state, State::ENABLE_NETWORK); _network_enable(ap);
_submit_cmd(Cmd_str("ENABLE_NETWORK ", _processed_ap->id));
} }
} else {
_processed_ap->enabled = false;
/* trigger the next round */
_processed_ap = nullptr;
_network_disable();
} }
successfully = true; successfully = true;
} }
break; break;
case State::DISCONNECT_NETWORK: }
_state_transition(_state, State::IDLE);
if (!cmd_successful(msg)) {
Genode::error("could not disconnect from network: ", msg);
} else {
_network_disable();
successfully = true;
}
break;
case State::LIST_NETWORKS: case State::LIST_NETWORKS:
_state_transition(_state, State::IDLE); _state_transition(_state, State::IDLE);
@ -1282,8 +1247,7 @@ struct Wifi::Frontend
Genode::error("cannot disabled failed network"); Genode::error("cannot disabled failed network");
} else { } else {
_processed_ap = p; _processed_ap = p;
_state_transition(state, State::DISABLE_NETWORK); _network_disable(*_processed_ap);
_submit_cmd(Cmd_str("DISABLE_NETWORK ", p->id));
} }
} else } else