[git commit] udhcpc: ignore zero-length DHCP options, take 2

Denys Vlasenko vda.linux at googlemail.com
Tue Mar 16 10:42:56 UTC 2021


commit: https://git.busybox.net/busybox/commit/?id=fe78d70ec6c48f88126f6deffe04d4707a65c9ac
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

advance the optionptr by two bytes, not one

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 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 99ecb7aa6..f2d6907ad 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 */


More information about the busybox-cvs mailing list