Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes:
1) Perform garbage collection from workqueue to fix rcu detected
stall in ipset hash set types, from Jozsef Kadlecsik.
2) Fix the forceadd evaluation path, also from Jozsef.
3) Fix nft_set_pipapo selftest, from Stefano Brivio.
4) Crash when add-flush-add element in pipapo set, also from Stefano.
Add test to cover this crash.
5) Remove sysctl entry under mutex in hashlimit, from Cong Wang.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/linux/netfilter/ipset/ip_set.h 10 additions, 1 deletioninclude/linux/netfilter/ipset/ip_set.h
- net/netfilter/ipset/ip_set_core.c 24 additions, 10 deletionsnet/netfilter/ipset/ip_set_core.c
- net/netfilter/ipset/ip_set_hash_gen.h 440 additions, 195 deletionsnet/netfilter/ipset/ip_set_hash_gen.h
- net/netfilter/nft_set_pipapo.c 4 additions, 2 deletionsnet/netfilter/nft_set_pipapo.c
- net/netfilter/xt_hashlimit.c 6 additions, 10 deletionsnet/netfilter/xt_hashlimit.c
- tools/testing/selftests/netfilter/nft_concat_range.sh 45 additions, 10 deletionstools/testing/selftests/netfilter/nft_concat_range.sh
Loading
Please register or sign in to comment