Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix breakage of dhcp_lease_time utility.

Browse Source
This commit is contained in:
Simon Kelley
2019-08-14 21:52:50 +01:00
parent ab73a746a0
commit 225accd235
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -38,6 +38,10 @@ version 2.81
the DHCP server in subnets where the server (or relay) doesn't the DHCP server in subnets where the server (or relay) doesn't
have an interface on the network in that subnet. Many thanks to have an interface on the network in that subnet. Many thanks to
kamp.de for sponsoring this feature. kamp.de for sponsoring this feature.
Fix broken contrib/lease_tools/dhcp_lease_time.c. A packet
validation check got borked in commit 2b38e382 and release 2.80.
Thanks to Tomasz Szajner for spotting this.
version 2.80 version 2.80

2
contrib/lease-tools/dhcp_lease_time.c
View File

@@ -83,7 +83,7 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
if (p >= end - 2) if (p >= end - 2)
return NULL; /* malformed packet */ return NULL; /* malformed packet */
opt_len = option_len(p); opt_len = option_len(p);
if (end - p >= (2 + opt_len)) if (end - p < (2 + opt_len))
return NULL; /* malformed packet */ return NULL; /* malformed packet */
if (*p == opt && opt_len >= minsize) if (*p == opt && opt_len >= minsize)
return p; return p;