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 off-by-one in DHCPv6 FQDN option decoding.

Browse Source
This commit is contained in:
Simon Kelley
2012-03-30 20:48:20 +01:00
parent 5ef33279f2
commit fbbc14541a
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/rfc3315.c
View File

@@ -349,28 +349,28 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if (len != 0 && len < 255) if (len != 0 && len < 255)
{ {
unsigned char *pp, *op = opt6_ptr(opt, 1); unsigned char *pp, *op = opt6_ptr(opt, 1);
char *pq = daemon->dhcp_buff; char *pq = daemon->dhcp_buff;
pp = op; pp = op;
while (*op != 0 && ((op + (*op) + 1) - pp) < len) while (*op != 0 && ((op + (*op)) - pp) < len)
{ {
memcpy(pq, op+1, *op); memcpy(pq, op+1, *op);
pq += *op; pq += *op;
op += (*op)+1; op += (*op)+1;
*(pq++) = '.'; *(pq++) = '.';
} }
if (pq != daemon->dhcp_buff) if (pq != daemon->dhcp_buff)
pq--; pq--;
*pq = 0; *pq = 0;
if (legal_hostname(daemon->dhcp_buff)) if (legal_hostname(daemon->dhcp_buff))
{ {
client_hostname = daemon->dhcp_buff; client_hostname = daemon->dhcp_buff;
if (option_bool(OPT_LOG_OPTS)) if (option_bool(OPT_LOG_OPTS))
my_syslog(MS_DHCP | LOG_INFO, _("%u client provides name: %s"), xid, client_hostname); my_syslog(MS_DHCP | LOG_INFO, _("%u client provides name: %s"), xid, client_hostname);
} }
} }
} }