sd-dhcp-client: move packet size check to dhcp_packet_verify_headers()

No functional change.
2023-11-08 17:54:52 +09:00
parent 7f42c66015
commit a57dd1d13f
2 changed files with 3 additions and 3 deletions
@@ -129,7 +129,9 @@ int dhcp_packet_verify_headers(DHCPPacket *packet, size_t len, bool checksum, ui
        size_t hdrlen;

        assert(packet);
-        assert(len >= sizeof(DHCPPacket));
+
+        if (len < sizeof(DHCPPacket))
+                return 0;

        /* IP */

@@ -2211,8 +2211,6 @@ static int client_receive_message_raw(
                log_dhcp_client_errno(client, len, "Could not receive message from raw socket, ignoring: %m");
                return 0;
        }
-        if ((size_t) len < sizeof(DHCPPacket))
-                return 0;

        cmsg = cmsg_find(&msg, SOL_PACKET, PACKET_AUXDATA, CMSG_LEN(sizeof(struct tpacket_auxdata)));
        if (cmsg) {