netfilter: ipset: use unified from/to address masking and check the usage

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>

7 files changed, 9 insertions, 17 deletions

diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c
index 49323110560..c46e3440159 100644
--- a/net/netfilter/ipset/ip_set_bitmap_ip.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ip.c
@@ -283,8 +283,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr > 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                ip &= ip_set_hostmask(cidr);
-                ip_to = ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(ip, ip_to, cidr);
         } else
                 ip_to = ip;
 
@@ -478,8 +477,7 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
 
                 if (cidr >= 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                first_ip &= ip_set_hostmask(cidr);
-                last_ip = first_ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(first_ip, last_ip, cidr);
         } else
                 return -IPSET_ERR_PROTOCOL;
 
diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c
index 5deb7bb3746..aa2cfa1ed47 100644
--- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c
@@ -578,7 +578,7 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr >= 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                last_ip = first_ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(first_ip, last_ip, cidr);
         } else
                 return -IPSET_ERR_PROTOCOL;
 
diff --git a/net/netfilter/ipset/ip_set_hash_ip.c b/net/netfilter/ipset/ip_set_hash_ip.c
index c3bc06d353d..bdb432e22a8 100644
--- a/net/netfilter/ipset/ip_set_hash_ip.c
+++ b/net/netfilter/ipset/ip_set_hash_ip.c
@@ -177,8 +177,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr > 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                ip &= ip_set_hostmask(cidr);
-                ip_to = ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(ip, ip_to, cidr);
         } else
                 ip_to = ip;
 
diff --git a/net/netfilter/ipset/ip_set_hash_ipport.c b/net/netfilter/ipset/ip_set_hash_ipport.c
index de2e351034a..bdeb7160508 100644
--- a/net/netfilter/ipset/ip_set_hash_ipport.c
+++ b/net/netfilter/ipset/ip_set_hash_ipport.c
@@ -216,8 +216,7 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr > 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                ip &= ip_set_hostmask(cidr);
-                ip_to = ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(ip, ip_to, cidr);
         } else
                 ip_to = ip;
 
diff --git a/net/netfilter/ipset/ip_set_hash_ipportip.c b/net/netfilter/ipset/ip_set_hash_ipportip.c
index 031ed057c81..fb986fc6a6f 100644
--- a/net/netfilter/ipset/ip_set_hash_ipportip.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportip.c
@@ -224,8 +224,7 @@ hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr > 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                ip &= ip_set_hostmask(cidr);
-                ip_to = ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(ip, ip_to, cidr);
         } else
                 ip_to = ip;
 
diff --git a/net/netfilter/ipset/ip_set_hash_ipportnet.c b/net/netfilter/ipset/ip_set_hash_ipportnet.c
index ef068b03ec1..2ed5e758105 100644
--- a/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@ -254,8 +254,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr > 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                ip &= ip_set_hostmask(cidr);
-                ip_to = ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(ip, ip_to, cidr);
         }
 
         port_to = port = ntohs(data.port);
@@ -273,8 +272,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
                 if (ip2_from + UINT_MAX == ip2_to)
                         return -IPSET_ERR_HASH_RANGE;
         } else {
-                ip2_from &= ip_set_hostmask(data.cidr);
-                ip2_to = ip2_from | ~ip_set_hostmask(data.cidr);
+                ip_set_mask_from_to(ip2_from, ip2_to, data.cidr);
         }
 
         if (retried)
diff --git a/net/netfilter/ipset/ip_set_hash_netport.c b/net/netfilter/ipset/ip_set_hash_netport.c
index 30010309687..90adc2c3066 100644
--- a/net/netfilter/ipset/ip_set_hash_netport.c
+++ b/net/netfilter/ipset/ip_set_hash_netport.c
@@ -245,8 +245,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[],
                 if (ip + UINT_MAX == ip_to)
                         return -IPSET_ERR_HASH_RANGE;
         } else {
-                ip &= ip_set_hostmask(data.cidr);
-                ip_to = ip | ~ip_set_hostmask(data.cidr);
+                ip_set_mask_from_to(ip, ip_to, data.cidr);
         }
 
         if (retried)