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

Fix length->netmask conversions to avoid undefined behaviour.

Browse Source
This commit is contained in:
Richard Genoud
2014-09-17 21:17:39 +01:00
committed by Simon Kelley
parent 15b1b7e9c3
commit 10cfc0ddb3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth.c
View File

@@ -31,7 +31,7 @@ static struct addrlist *find_subnet(struct auth_zone *zone, int flag, struct all
if (!(flag & F_IPV4)) if (!(flag & F_IPV4))
continue; continue;
netmask.s_addr = htonl(~((1 << (32 - subnet->prefixlen)) - 1)); netmask.s_addr = htonl(~(in_addr_t)0 << (32 - subnet->prefixlen));
if (is_same_net(addr, subnet->addr.addr.addr4, netmask)) if (is_same_net(addr, subnet->addr.addr.addr4, netmask))
return subnet; return subnet;

3
src/netlink.c
View File

@@ -208,7 +208,8 @@ int iface_enumerate(int family, void *parm, int (*callback)())
struct in_addr netmask, addr, broadcast; struct in_addr netmask, addr, broadcast;
char *label = NULL; char *label = NULL;
netmask.s_addr = htonl(0xffffffff << (32 - ifa->ifa_prefixlen)); netmask.s_addr = htonl(~(in_addr_t)0 << (32 - ifa->ifa_prefixlen));
addr.s_addr = 0; addr.s_addr = 0;
broadcast.s_addr = 0; broadcast.s_addr = 0;