From: Richard Genoud <richard.genoud@gmail.com>
Date: Wed, 17 Sep 2014 20:17:39 +0000 (+0100)
Subject: Fix length->netmask conversions to avoid undefined behaviour.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10cfc0ddb35d8e7d19bdb86240a49004980b1ff8;p=people%2Fms%2Fdnsmasq.git

Fix length->netmask conversions to avoid undefined behaviour.
---

diff --git a/src/auth.c b/src/auth.c
index 066a9e4..dd46566 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -31,7 +31,7 @@ static struct addrlist *find_subnet(struct auth_zone *zone, int flag, struct all
 	  if (!(flag & F_IPV4))
 	    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))
 	    return subnet;
diff --git a/src/netlink.c b/src/netlink.c
index cff43cc..b393283 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -208,7 +208,8 @@ int iface_enumerate(int family, void *parm, int (*callback)())
 		    struct in_addr netmask, addr, broadcast;
 		    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;
 		    broadcast.s_addr = 0;