1
0
mirror of https://passt.top/passt synced 2024-07-04 00:42:41 +00:00

dhcp: Minimum option length implied by RFC 951 is 60 bytes, not 62

In section 3 ("Packet Format"), "vend" is 64 bytes long, minus the
magic that's 60 bytes, not 62.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-03-25 08:32:55 +01:00
parent 54d9df3903
commit f41f0416b8

8
dhcp.c
View File

@ -57,6 +57,8 @@ static struct opt opts[255];
#define DHCPINFORM 8 #define DHCPINFORM 8
#define DHCPFORCERENEW 9 #define DHCPFORCERENEW 9
#define OPT_MIN 60 /* RFC 951 */
/** /**
* dhcp_init() - Initialise DHCP options * dhcp_init() - Initialise DHCP options
*/ */
@ -158,9 +160,9 @@ static int fill(struct msg *m)
m->o[offset++] = 255; m->o[offset++] = 255;
m->o[offset++] = 0; m->o[offset++] = 0;
if (offset < 62 /* RFC 951 */) { if (offset < OPT_MIN) {
memset(&m->o[offset], 0, 62 - offset); memset(&m->o[offset], 0, OPT_MIN - offset);
offset = 62; offset = OPT_MIN;
} }
return offset; return offset;