netfilter: ipset: Fix cidr handling for hash:*net* types

Browse source

Commit "Simplify cidr handling for hash:*net* types" broke the cidr
handling for the hash:*net* types when the sets were used by the SET
target: entries with invalid cidr values were added to the sets.
Reported by Jonathan Johnson.

Testsuite entry is added to verify the fix.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

...

This commit is contained in:

Jozsef Kadlecsik 2015-06-12 22:11:00 +02:00

parent aff227581e

commit f690cbaed9

8 changed files with 42 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/linux/netfilter/ipset/ip_set.h

View file

44

net/netfilter/ipset/ip_set_hash_gen.h

View file

4

net/netfilter/ipset/ip_set_hash_ipportnet.c

View file

4

net/netfilter/ipset/ip_set_hash_net.c

View file

4

net/netfilter/ipset/ip_set_hash_netiface.c

View file

8

net/netfilter/ipset/ip_set_hash_netnet.c

View file

4

net/netfilter/ipset/ip_set_hash_netport.c

View file

8

net/netfilter/ipset/ip_set_hash_netportnet.c

View file