From: Roy Marples <roy@marples.name>
Date: Sun, 4 Mar 2007 15:08:21 +0000 (+0000)
Subject: When we get an invalid length for a DHCP option, try and continue anyway.
X-Git-Tag: v3.2.3~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a3d9e0cf12e37fa4ea2fe6872d55fc7603a81a8;p=thirdparty%2Fdhcpcd.git

When we get an invalid length for a DHCP option, try and continue anyway.
---

diff --git a/ChangeLog b/ChangeLog
index 38a645e2..46da5318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+When we get an invalid length for a DHCP option, try and continue anyway.
+
 dhcpcd-3.0.16
 RFC 2131 is full of confusion regarding MTU it seems as the effective minimum
 MTU is really 576 or DHCP requests stop working.
diff --git a/dhcp.c b/dhcp.c
index 72b69deb..95ec84b7 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -519,8 +519,8 @@ int parse_dhcpmessage (dhcp_t *dhcp, const dhcpmessage_t *message)
 #define LEN_ERR \
     { \
       logger (LOG_ERR, "invalid length %d for option %d", length, option); \
-      retval = -1; \
-      goto eexit; \
+      p += length; \
+      continue; \
     }
 
   while (p < end)