diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2012-11-05 16:56:42 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2012-11-05 16:56:42 +0100 |
| commit | 12ce5f09acfece76aeb5021de583d156567249d5 (patch) | |
| tree | bd52ff3b1eb7284ddbdf8e125e603b3fe500a39a /kernel/net/netfilter/ipset/ip_set_hash_ip.c | |
| parent | 79227b290d1ce936ca4c09652b4b089397d25f4b (diff) | |
Fix range bug in hash:ip,port,net
Due to the missing ininitalization at adding/deleting entries, when
a plain_ip,port,net element was to be added, multiple elements were
added/deleted instead. The bug came from the missing dangling
default initialization.
The error-prone default initialization is corrected in all hash:* types.
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_hash_ip.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_ip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ip.c b/kernel/net/netfilter/ipset/ip_set_hash_ip.c index ec3dba5..5c0b785 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_ip.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_ip.c @@ -173,6 +173,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], return adtfn(set, &nip, timeout, flags); } + ip_to = ip; if (tb[IPSET_ATTR_IP_TO]) { ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP_TO], &ip_to); if (ret) @@ -185,8 +186,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], if (!cidr || cidr > 32) return -IPSET_ERR_INVALID_CIDR; ip_set_mask_from_to(ip, ip_to, cidr); - } else - ip_to = ip; + } hosts = h->netmask == 32 ? 1 : 2 << (32 - h->netmask - 1); |