dhcp-client: reject messages larger than the maximum UDP payload

dhcp_message_verify_header() only enforced a lower bound on the input
length, so dhcp_message_parse() happily accepted arbitrarily large
buffers. Such inputs could never have been received via UDP and would
later fail in dhcp_message_build() with -E2BIG once the parsed options'
combined size exceeds UDP_PAYLOAD_MAX_SIZE, which the fuzzer surfaced as
an assertion failure.

Reject inputs above UDP_PAYLOAD_MAX_SIZE up front, so the parse stage
mirrors what the wire format can actually carry.

Follow-up for 8c18bb6547

Fixes https://github.com/systemd/systemd/issues/42147

Co-developed-by: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Luca Boccassi
2026-05-19 01:43:25 +09:00
committed by Yu Watanabe
parent cc9ab5af2d
commit 6fa5ebc506
2 changed files with 5 additions and 0 deletions
+5
View File
@@ -1342,6 +1342,11 @@ static int dhcp_message_verify_header(
if (iov->iov_len < sizeof(DHCPMessageHeader))
return -EBADMSG;
/* DHCP travels over UDP, so anything larger than the maximum UDP payload cannot be a valid
* message and would also be impossible to rebuild as a UDP packet. */
if (iov->iov_len > UDP_PAYLOAD_MAX_SIZE)
return -EBADMSG;
const DHCPMessageHeader *header = iov->iov_base;
if (!IN_SET(header->op, BOOTREQUEST, BOOTREPLY))
Binary file not shown.