From: Alexandre Peixoto Ferreira <alexandref75@gmail.com>
Date: Mon, 25 Sep 2023 02:46:41 +0000 (-0500)
Subject: sd-dhcp-client: reject NAKs from servers that we did not send an offer to (#29290)
X-Git-Tag: v255-rc1~448
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13abd00685664ada99159adcfe0c4af9c889e96f;p=thirdparty%2Fsystemd.git

sd-dhcp-client: reject NAKs from servers that we did not send an offer to (#29290)

To support multiple DHCP servers in a network.
---

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index cfdee5d6b4e..79f308f6528 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1591,9 +1591,14 @@ static int client_parse_message(
         case DHCP_STATE_REQUESTING:
         case DHCP_STATE_RENEWING:
         case DHCP_STATE_REBINDING:
-                if (r == DHCP_NAK)
+                if (r == DHCP_NAK) {
+                        if (client->lease && client->lease->server_address != lease->server_address)
+                                    return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG),
+                                                                 "NAK from unexpected server, ignoring: %s",
+                                                                 strna(error_message));
                         return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(EADDRNOTAVAIL),
                                                      "NAK: %s", strna(error_message));
+                }
                 if (r != DHCP_ACK)
                         return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG),
                                                      "received message was not an ACK, ignoring.");