Fix potential empty DHCP Parameter Request List
Signed-off-by Gray Remlin <[email protected]>
--- net/bootp.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
net/bootp.c +0 -0
@@ -417,8 +417,21 @@ static int DhcpExtended (u8 * e, int message_type,
IPaddr_t ServerID, IPaddr_t R
return x - start;
#endif
+/*
+ * RFC2132: An empty Parameter Request List is not legitimate,
+ * it must have at minimum one request.
+ */
+#if defined(CONFIG_BOOTP_SUBNETMASK) || \
+ defined(CONFIG_BOOTP_TIMEOFFSET) || \
+ defined(CONFIG_BOOTP_GATEWAY) || \
+ defined(CONFIG_BOOTP_DNS) || \
+ defined(CONFIG_BOOTP_HOSTNAME) || \
+ defined(CONFIG_BOOTP_BOOTFILESIZE) || \
+ defined(CONFIG_BOOTP_BOOTPATH) || \
+ defined(CONFIG_BOOTP_NISDOMAIN) || \
+ defined(CONFIG_BOOTP_NTPSERVER)
*e++ = 55; /* Parameter Request List */
- cnt = e++; /* Pointer to count of requested items */
+ cnt = e++; /* Pointer to count of requested items */
*cnt = 0; #if defined(CONFIG_BOOTP_SUBNETMASK)
*e++ = 1; /* Subnet Mask */
@@ -456,6 +469,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
*e++ = 42;
*cnt += 1;
#endif
+#endif
*e++ = 255; /* End of the list */
/* Pad to minimal length */--
Dear Gray Remlin,
Quoted 5 lines · In message <[email protected]> you wrote:
Signed-off-by Gray Remlin <[email protected]>--- net/bootp.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
Why exactly are you reposting all your patches without any additional comments?
Did you fail to read
http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions
?
Please explain the reasons for the repostings.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Virtual" means never knowing where your next byte is coming from.