Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net 1) Fix bogus compilter warning in nfnetlink_queue, from Florian Westphal. 2) Don't run conntrack on vrf with !dflt qdisc, from Nicolas Dichtel. 3) Fix nft_pipapo bucket load in AVX2 lookup routine for six 8-bit groups, from Stefano Brivio. 4) Break rule evaluation on malformed TCP options. 5) Use socat instead of nc in selftests/netfilter/nft_zones_many.sh, also from Florian 6) Fix KCSAN data-race in conntrack timeout updates, from Eric Dumazet. * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf: netfilter: conntrack: annotate data-races around ct->timeout selftests: netfilter: switch zone stress to socat netfilter: nft_exthdr: break evaluation if setting TCP option fails selftests: netfilter: Add correctness test for mac,net set type nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups vrf: don't run conntrack on vrf with !dflt qdisc netfilter: nfnetlink_queue: silence bogus compiler warning ==================== Link: https://lore.kernel.org/r/20211209000847.102598-1-pablo@netfilter.org Signed-off-by:Jakub Kicinski <kuba@kernel.org>
No related branches found
No related tags found
Showing
- drivers/net/vrf.c 4 additions, 4 deletionsdrivers/net/vrf.c
- include/net/netfilter/nf_conntrack.h 3 additions, 3 deletionsinclude/net/netfilter/nf_conntrack.h
- net/netfilter/nf_conntrack_core.c 3 additions, 3 deletionsnet/netfilter/nf_conntrack_core.c
- net/netfilter/nf_conntrack_netlink.c 1 addition, 1 deletionnet/netfilter/nf_conntrack_netlink.c
- net/netfilter/nf_flow_table_core.c 2 additions, 2 deletionsnet/netfilter/nf_flow_table_core.c
- net/netfilter/nfnetlink_queue.c 1 addition, 1 deletionnet/netfilter/nfnetlink_queue.c
- net/netfilter/nft_exthdr.c 7 additions, 4 deletionsnet/netfilter/nft_exthdr.c
- net/netfilter/nft_set_pipapo_avx2.c 1 addition, 1 deletionnet/netfilter/nft_set_pipapo_avx2.c
- tools/testing/selftests/netfilter/conntrack_vrf.sh 26 additions, 4 deletionstools/testing/selftests/netfilter/conntrack_vrf.sh
- tools/testing/selftests/netfilter/nft_concat_range.sh 21 additions, 3 deletionstools/testing/selftests/netfilter/nft_concat_range.sh
- tools/testing/selftests/netfilter/nft_zones_many.sh 13 additions, 6 deletionstools/testing/selftests/netfilter/nft_zones_many.sh
Loading
Please register or sign in to comment