Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Do not refresh timeout in SYN_SENT for syn retransmissions.
Add selftest for unreplied TCP connection, from Florian Westphal.
2) Fix null dereference from error path with hardware offload
in nftables.
3) Remove useless nf_ct_gre_keymap_flush() from netns exit path,
from Vasily Averin.
4) Missing rcu read-lock side in ctnetlink helper info dump,
also from Vasily.
5) Do not mark RST in the reply direction coming after SYN packet
for an out-of-sync entry, from Ali Abdallah and Florian Westphal.
6) Add tcp_ignore_invalid_rst sysctl to allow to disable out of
segment RSTs, from Ali.
7) KCSAN fix for nf_conntrack_all_lock(), from Manfred Spraul.
8) Honor NFTA_LAST_SET in nft_last.
9) Fix incorrect arithmetics when restore last_jiffies in nft_last.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/networking/nf_conntrack-sysctl.rst 6 additions, 0 deletionsDocumentation/networking/nf_conntrack-sysctl.rst
- include/net/netfilter/nf_conntrack_core.h 0 additions, 1 deletioninclude/net/netfilter/nf_conntrack_core.h
- include/net/netns/conntrack.h 1 addition, 0 deletionsinclude/net/netns/conntrack.h
- include/uapi/linux/netfilter/nfnetlink_log.h 1 addition, 1 deletioninclude/uapi/linux/netfilter/nfnetlink_log.h
- include/uapi/linux/netfilter/nfnetlink_queue.h 2 additions, 2 deletionsinclude/uapi/linux/netfilter/nfnetlink_queue.h
- net/netfilter/nf_conntrack_core.c 9 additions, 2 deletionsnet/netfilter/nf_conntrack_core.c
- net/netfilter/nf_conntrack_netlink.c 3 additions, 0 deletionsnet/netfilter/nf_conntrack_netlink.c
- net/netfilter/nf_conntrack_proto.c 0 additions, 7 deletionsnet/netfilter/nf_conntrack_proto.c
- net/netfilter/nf_conntrack_proto_gre.c 0 additions, 13 deletionsnet/netfilter/nf_conntrack_proto_gre.c
- net/netfilter/nf_conntrack_proto_tcp.c 51 additions, 18 deletionsnet/netfilter/nf_conntrack_proto_tcp.c
- net/netfilter/nf_conntrack_standalone.c 10 additions, 0 deletionsnet/netfilter/nf_conntrack_standalone.c
- net/netfilter/nf_tables_api.c 2 additions, 1 deletionnet/netfilter/nf_tables_api.c
- net/netfilter/nft_last.c 9 additions, 3 deletionsnet/netfilter/nft_last.c
- tools/testing/selftests/netfilter/Makefile 1 addition, 1 deletiontools/testing/selftests/netfilter/Makefile
- tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh 167 additions, 0 deletionstools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh
Please register or sign in to comment