diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-05-22 12:18:36 +0200 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-05-22 12:18:36 +0200 |
commit | bba6bcb29f69831ab0e50a85d95884ce31293174 (patch) | |
tree | d92f4b4fc7b0d31f13ea78fe85c8884283d2ad74 | |
parent | c9042dea600145c3e278a33de69ba5db70c7bcec (diff) |
Take into account cidr value for the from address when creating the set
When creating a set from a range expressed as a network like
10.1.1.172/29, the from address was taken as the IP address part and
not masked with the netmask from the cidr.
-rw-r--r-- | kernel/net/netfilter/ipset/ip_set_bitmap_ip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c b/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c index 3b5920b..4932311 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c @@ -478,6 +478,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); } else return -IPSET_ERR_PROTOCOL; |