Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

Browse source

Pablo Neira Ayuso says:

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

The following patchset contains Netfilter fixes for net:

1) Restore ctnetlink zero mark in events and dump, from Ivan Delalande.

2) Fix deadlock due to missing disabled bh in tproxy, from Florian Westphal.

3) Safer maximum chain load in conntrack, from Eric Dumazet.

* 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: conntrack: adopt safer max chain length
  netfilter: tproxy: fix deadlock due to missing BH disable
  netfilter: ctnetlink: revert to dumping mark regardless of event type
====================

Link: https://lore.kernel.org/r/20230307100424.2037-1-pablo@netfilter.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

...

This commit is contained in:

Paolo Abeni 2023-03-07 13:52:03 +01:00

parent 757b56a6c7 c77737b736

commit 775c73df90

5 changed files with 18 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

include/net/netfilter/nf_tproxy.h

View file

2

net/ipv4/netfilter/nf_tproxy_ipv4.c

View file

2

net/ipv6/netfilter/nf_tproxy_ipv6.c

View file

4

net/netfilter/nf_conntrack_core.c

View file

14

net/netfilter/nf_conntrack_netlink.c

View file