From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 30 Jun 2022 03:09:32 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
X-Git-Tag: baikal/mips/sdk6.1~5397^2~14
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=92bd7235b8ef2a1f4e05acbb8374a5abf6bfe7bd;p=kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

1) Restore set counter when one of the CPU loses race to add elements
   to sets.

2) After NF_STOLEN, skb might be there no more, update nftables trace
   infra to avoid access to skb in this case. From Florian Westphal.

3) nftables bridge might register a prerouting hook with zero priority,
   br_netfilter incorrectly skips it. Also from Florian.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: br_netfilter: do not skip all hooks with 0 priority
  netfilter: nf_tables: avoid skb access on nf_stolen
  netfilter: nft_dynset: restore set element counter when failing to update
====================

Link: https://lore.kernel.org/r/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

92bd7235b8ef2a1f4e05acbb8374a5abf6bfe7bd