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

Browse source

Pablo Neira Ayuso says:

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

1) Don't refresh timeout for SCTP flows in CLOSED state.

2) Don't allow access to transport header if fragment offset is set on.

3) Reinitialize internal conntrack state for retransmitted TCP
   syn-ack packet.

4) Update MAINTAINER file to add the Netfilter group tree. Moving
   forward, Florian Westphal has access to this tree so he can also
   send pull requests.

5) Set on IPS_HELPER for entries created via ctnetlink, otherwise NAT
   might zap it.

All patches from Florian Westphal.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: ctnetlink: disable helper autoassign
  MAINTAINERS: netfilter: update git links
  netfilter: conntrack: re-init state for retransmitted syn-ack
  netfilter: conntrack: move synack init code to helper
  netfilter: nft_payload: don't allow th access for fragments
  netfilter: conntrack: don't refresh sctp entries in closed state
====================

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

...

This commit is contained in:

Jakub Kicinski 2022-02-04 08:47:41 -08:00

parent fe68195daf d1ca60efc5

commit 40106e005b

7 changed files with 61 additions and 27 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

4

MAINTAINERS

View file

2

include/uapi/linux/netfilter/nf_conntrack_common.h

View file

3

net/netfilter/nf_conntrack_netlink.c

View file

9

net/netfilter/nf_conntrack_proto_sctp.c

View file

59

net/netfilter/nf_conntrack_proto_tcp.c

View file

2

net/netfilter/nft_exthdr.c

View file

9

net/netfilter/nft_payload.c

View file