From fe78d70ec6c48f88126f6deffe04d4707a65c9ac Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 16 Mar 2021 11:42:56 +0100 Subject: udhcpc: ignore zero-length DHCP options, take 2 advance the optionptr by two bytes, not one Signed-off-by: Denys Vlasenko --- networking/udhcp/common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index 99ecb7a..f2d6907 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c @@ -282,11 +282,11 @@ uint8_t* FAST_FUNC udhcp_scan_options(struct dhcp_packet *packet, struct dhcp_sc * (this violates RFC 2132 section 3.14). */ if (len == 0) { - scan_state->rem -= OPT_LEN; - scan_state->optionptr += OPT_LEN; + scan_state->rem -= 2; + scan_state->optionptr += 2; continue; } - len += OPT_LEN; + len += 2; scan_state->rem -= len; if (scan_state->rem < 0) /* option is longer than options field? */ goto complain; /* yes, complain and return NULL */ -- cgit v1.1