Hi,
The following patchset contains 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.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 34d8778a943761121f391b7921f79a7adbe1feaf:
MAINTAINERS: s390/net: add Alexandra and Wenjia as maintainer (2021-11-30 12:20:07 +0000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 802a7dc5cf1bef06f7b290ce76d478138408d6b1:
netfilter: conntrack: annotate data-races around ct->timeout (2021-12-08 01:29:15 +0100)
----------------------------------------------------------------
Eric Dumazet (1):
netfilter: conntrack: annotate data-races around ct->timeout
Florian Westphal (2):
netfilter: nfnetlink_queue: silence bogus compiler warning
selftests: netfilter: switch zone stress to socat
Nicolas Dichtel (1):
vrf: don't run conntrack on vrf with !dflt qdisc
Pablo Neira Ayuso (1):
netfilter: nft_exthdr: break evaluation if setting TCP option fails
Stefano Brivio (2):
nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups
selftests: netfilter: Add correctness test for mac,net set type
drivers/net/vrf.c | 8 +++---
include/net/netfilter/nf_conntrack.h | 6 ++---
net/netfilter/nf_conntrack_core.c | 6 ++---
net/netfilter/nf_conntrack_netlink.c | 2 +-
net/netfilter/nf_flow_table_core.c | 4 +--
net/netfilter/nfnetlink_queue.c | 2 +-
net/netfilter/nft_exthdr.c | 11 +++++---
net/netfilter/nft_set_pipapo_avx2.c | 2 +-
tools/testing/selftests/netfilter/conntrack_vrf.sh | 30 +++++++++++++++++++---
.../selftests/netfilter/nft_concat_range.sh | 24 ++++++++++++++---
.../testing/selftests/netfilter/nft_zones_many.sh | 19 +++++++++-----
11 files changed, 82 insertions(+), 32 deletions(-)
