From: Roy Marples <roy@marples.name>
Date: Sat, 6 Mar 2010 17:46:01 +0000 (+0000)
Subject: We should not set a maximum message size bigger than what we can
X-Git-Tag: v5.2.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2197cff1ae8808c9a160667dbdf45e43a63dff98;p=thirdparty%2Fdhcpcd.git

We should not set a maximum message size bigger than what we can
actually handle.
---

diff --git a/dhcp.c b/dhcp.c
index df9f1f43..fa740a89 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -925,6 +925,11 @@ make_message(struct dhcp_message **message,
 		if (sz < MTU_MIN) {
 			if (set_mtu(iface->name, MTU_MIN) == 0)
 				sz = MTU_MIN;
+		} else if (sz > MTU_MAX) {
+			/* Even though our MTU could be greater than
+			 * MTU_MAX (1500) dhcpcd does not presently
+			 * handle DHCP packets any bigger. */
+			sz = MTU_MAX;
 		}
 		sz = htons(sz);
 		memcpy(p, &sz, 2);