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

Detect malformed --dhcp-relay option.

Browse Source 
Spotted by Max Julian Hofmann and the Advanced Research Team at CrowdStrike
This commit is contained in:
Simon Kelley
2021-07-20 23:49:38 +01:00
parent cbd984287f
commit b741059549
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/option.c
View File

@@ -4183,13 +4183,13 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
comma = split(arg); comma = split(arg);
new->interface = opt_string_alloc(split(comma)); new->interface = opt_string_alloc(split(comma));
new->iface_index = 0; new->iface_index = 0;
if (inet_pton(AF_INET, arg, &new->local) && inet_pton(AF_INET, comma, &new->server)) if (comma && inet_pton(AF_INET, arg, &new->local) && inet_pton(AF_INET, comma, &new->server))
{ {
new->next = daemon->relay4; new->next = daemon->relay4;
daemon->relay4 = new; daemon->relay4 = new;
} }
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
else if (inet_pton(AF_INET6, arg, &new->local) && inet_pton(AF_INET6, comma, &new->server)) else if (comma && inet_pton(AF_INET6, arg, &new->local) && inet_pton(AF_INET6, comma, &new->server))
{ {
new->next = daemon->relay6; new->next = daemon->relay6;
daemon->relay6 = new; daemon->relay6 = new;