ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 21:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: fix DHCP deallocation on domain update

Browse Source 
Commit ac42ade introduced a regression that triggered an assertion in
`Dhcp_server::free_ip()` because the DHCP allocation was not properly
removed during a domain update. The underlying issue was that
`with_dhcp_server()` silently landed in the `no_dhcp_server_fn`.

Fixes #5364
This commit is contained in:
Johannes Schlatow 2024-10-16 13:23:02 +02:00 committed by Christian Helmuth
parent 4f084d1f9e
commit d87a235abb
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/os/src/server/nic_router/domain.h
View File

@ -232,7 +232,7 @@ class Net::Domain : public List<Domain>::Element,
dhcp_server_fn(*_dhcp_server_ptr); dhcp_server_fn(*_dhcp_server_ptr);
} }
void with_dhcp_server(auto const &fn) { with_dhcp_server(fn, []{}); } void with_optional_dhcp_server(auto const &fn) { with_dhcp_server(fn, []{}); }
/********* /*********
** log ** ** log **

34
repos/os/src/server/nic_router/interface.cc
View File

@ -1734,7 +1734,7 @@ void Interface::_continue_handle_eth(Packet_descriptor const &pkt)
void Interface::_destroy_dhcp_allocation(Dhcp_allocation &allocation, void Interface::_destroy_dhcp_allocation(Dhcp_allocation &allocation,
Domain &local_domain) Domain &local_domain)
{ {
local_domain.with_dhcp_server([&] (Dhcp_server &srv) { local_domain.with_optional_dhcp_server([&] (Dhcp_server &srv) {
srv.free_ip(allocation.ip()); }); srv.free_ip(allocation.ip()); });
destroy(_alloc, &allocation); destroy(_alloc, &allocation);
} }
@ -2035,6 +2035,18 @@ void Interface::_update_dhcp_allocations(Domain &old_domain,
Domain &new_domain) Domain &new_domain)
{ {
bool dhcp_clients_outdated { false }; bool dhcp_clients_outdated { false };
auto dismiss_all_fn = [&] () {
dhcp_clients_outdated = true;
while (Dhcp_allocation *allocation = _dhcp_allocations.first()) {
if (_config_ptr->verbose())
log("[", new_domain, "] dismiss DHCP allocation: ",
*allocation, " (other/no DHCP server)");
_dhcp_allocations.remove(*allocation);
_destroy_dhcp_allocation(*allocation, old_domain);
}
};
old_domain.with_dhcp_server([&] (Dhcp_server &old_dhcp_srv) { old_domain.with_dhcp_server([&] (Dhcp_server &old_dhcp_srv) {
new_domain.with_dhcp_server([&] (Dhcp_server &new_dhcp_srv) { new_domain.with_dhcp_server([&] (Dhcp_server &new_dhcp_srv) {
if (old_dhcp_srv.config_equal_to_that_of(new_dhcp_srv)) { if (old_dhcp_srv.config_equal_to_that_of(new_dhcp_srv)) {
@ -2054,18 +2066,16 @@ void Interface::_update_dhcp_allocations(Domain &old_domain,
}); });
} else { } else {
/* dismiss all DHCP allocations */ /* dismiss all DHCP allocations */
dhcp_clients_outdated = true; dismiss_all_fn();
while (Dhcp_allocation *allocation = _dhcp_allocations.first()) {
if (_config_ptr->verbose())
log("[", new_domain, "] dismiss DHCP allocation: ",
*allocation, " (other/no DHCP server)");
_dhcp_allocations.remove(*allocation);
_destroy_dhcp_allocation(*allocation, old_domain);
}
} }
if (dhcp_clients_outdated) },
_reset_and_refetch_domain_ready_state(); /* no DHCP server on new domain */
});}); [&] () { dismiss_all_fn(); }); },
/* no DHCP server on old domain */
[&] () { dismiss_all_fn(); });
if (dhcp_clients_outdated)
_reset_and_refetch_domain_ready_state();
} }