• Jakub Kicinski's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · fd31cb0c
    Jakub Kicinski authored
    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.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
    fd31cb0c
vrf.c 46.7 KB