denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: Make sure to only modify transactions after receiving an expected DHCP OFFER

Browse Source 
The `transaction` variable was previously still set to the one that
was enumerated last even if the received DHCP OFFER did not match
it.  So the transaction was incorrectly modified.  Once the real
DHCP OFFER would arrive, it would get modified again, but it could
allow adding unintended DNS servers.
This commit is contained in:
Tobias Brunner
2026-07-24 08:47:35 +02:00
parent 8c696dc90a
commit 289d776904
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/dhcp/dhcp_socket.c
+5 -4
View File
@@ -528,7 +528,7 @@ METHOD(dhcp_socket_t, release, void,
*/
static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, size_t optlen)
{
dhcp_transaction_t *transaction = NULL;
dhcp_transaction_t *discover, *transaction = NULL;
enumerator_t *enumerator;
host_t *offer, *server = NULL;
@@ -547,12 +547,13 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, size_t optle
this->mutex->lock(this->mutex);
enumerator = this->discover->create_enumerator(this->discover);
while (enumerator->enumerate(enumerator, &transaction))
while (enumerator->enumerate(enumerator, &discover))
{
if (transaction->get_id(transaction) == dhcp->transaction_id)
if (discover->get_id(discover) == dhcp->transaction_id)
{
this->discover->remove_at(this->discover, enumerator);
this->request->insert_last(this->request, transaction);
this->request->insert_last(this->request, discover);
transaction = discover;
break;
}
}