diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-11-30 22:01:28 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-11-30 22:01:29 -0800 |
| commit | d68d7d204afdc5e8e8f3e038e2ee048b5498ded3 (patch) | |
| tree | 7d4f4906ad782cff778eebf245e0c81afc000190 /net/unix | |
| parent | 6c681f899e0360803b924ac8c96ee21965118649 (diff) | |
| parent | 1feeae071507ad65cf9f462a1bdd543a4bf89e71 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
1) Check for interval validity in all concatenation fields in
nft_set_pipapo, from Stefano Brivio.
2) Missing preemption disabled in conntrack and flowtable stat
updates, from Xin Long.
3) Fix compilation warning when CONFIG_NF_CONNTRACK_MARK=n.
Except for 3) which was a bug introduced in a recent fix in 6.1-rc
- anything else, broken for several releases.
* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark
netfilter: conntrack: fix using __this_cpu_add in preemptible
netfilter: flowtable_offload: fix using __this_cpu_add in preemptible
netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one
====================
Link: https://lore.kernel.org/r/20221130121934.1125-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions