Skip to content

Netfilter fixes for net

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest12 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/12netfilter: conntrack: remove duplicated include from nf_conntrack_proto_udp.cnet/netfilter/nf_conntrack_proto_udp.c+0 -10 replies
2/12netfilter: xt_cluster: add dependency on conntrack modulenet/netfilter/xt_cluster.c+13 -10 replies
3/12netfilter: xt_checksum: ignore gso skbsnet/netfilter/Kconfig net/netfilter/xt_CHECKSUM.c+27 -70 replies
4/12netfilter: conntrack: place 'new' timeout in first location toonet/netfilter/nf_conntrack_proto_dccp.c net/netfilter/nf_conntrack_proto_sctp.c net/netfilter/nf_conntrack_proto_tcp.c+21 -00 replies
5/12netfilter: nf_tables: rework ct timeout set supportinclude/net/netfilter/nf_conntrack_timeout.h net/netfilter/nft_ct.c+30 -310 replies
6/12netfilter: kconfig: nat related expression depend on nftables corenet/ipv4/netfilter/Kconfig+5 -30 replies
7/12netfilter: nf_tables: release chain in flushing setnet/netfilter/nf_tables_api.c+1 -00 replies
8/12netfilter: conntrack: reset tcp maxwin on re-registernet/netfilter/nf_conntrack_proto.c+26 -00 replies
9/12netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUTnet/netfilter/nf_conntrack_proto_dccp.c net/netfilter/nf_conntrack_proto_generic.c net/netfilter/nf_conntrack_proto_gre.c +5 more+45 -450 replies
10/12netfilter: cttimeout: ctnl_timeout_find_get() returns incorrect pointer to typenet/netfilter/nfnetlink_cttimeout.c+3 -30 replies
11/12netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEATnet/netfilter/nfnetlink_queue.c+1 -00 replies
12/12netfilter: xt_hashlimit: use s->file instead of s->privatenet/netfilter/xt_hashlimit.c+9 -90 replies

Reviews trailers per patch

4 of 12 patches have a Reviewed-by or Acked-by.

PatchFlorian WestphalMichal KubecekRandy DunlapChristoph HellwigSami Farin
1/12
2/12A-b
3/12R-b
4/12
5/12
6/12A-b
7/12
8/12
9/12
10/12
11/12
12/12A-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v1 thread

Cover letter [PATCH 00/12] Netfilter fixes for net

Hi David,

The following patchset contains Netfilter fixes for you net tree:

1) Remove duplicated include at the end of UDP conntrack, from Yue Haibing.

2) Restore conntrack dependency on xt_cluster, from Martin Willi.

3) Fix splat with GSO skbs from the checksum target, from Florian Westphal.

4) Rework ct timeout support, the template strategy to attach custom timeouts is not correct since it will not work in conjunction with conntrack zones and we have a possible free after use when removing the rule due to missing refcounting. To fix these problems, do not use conntrack template at all and set custom timeout on the already valid conntrack object. This fix comes with a preparation patch to simplify timeout adjustment by initializating the first position of the timeout array for all of the existing trackers. Patchset from Florian Westphal.

5) Fix missing dependency on from IPv4 chain NAT type, from Florian.

6) Release chain reference counter from the flush path, from Taehee Yoo.

7) After flushing an iptables ruleset, conntrack hooks are unregistered and entries are left stale to be cleaned up by the timeout garbage collector. No TCP tracking is done on established flows by this time. If ruleset is reloaded, then hooks are registered again and TCP tracking is restored, which considers packets to be invalid. Clear window tracking to exercise TCP flow pickup from the middle given that history is lost for us. Again from Florian.

8) Fix crash from netlink interface with CONFIG_NF_CONNTRACK_TIMEOUT=y and CONFIG_NF_CT_NETLINK_TIMEOUT=n.

9) Broken CT target due to returning incorrect type from ctnl_timeout_find_get().

10) Solve conntrack clash on NF_REPEAT verdicts too, from Michal Vaner.

11) Missing conversion of hashlimit sysctl interface to new API, from Cong Wang.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

Thanks.

----------------------------------------------------------------

The following changes since commit 0d092f06faa46b95a8e07b9bb5737b7c0f1176ee:

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (2018-08-22 22:43:11 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD

for you to fetch changes up to 1286df269f498165061e0cf8092ca212545dbb5a:

netfilter: xt_hashlimit: use s->file instead of s->private (2018-09-11 01:35:32 +0200)

----------------------------------------------------------------
Cong Wang (1):

      netfilter: xt_hashlimit: use s->file instead of s->private

Florian Westphal (5):
netfilter: xt_checksum: ignore gso skbs
netfilter: conntrack: place 'new' timeout in first location too
netfilter: nf_tables: rework ct timeout set support
netfilter: kconfig: nat related expression depend on nftables core
netfilter: conntrack: reset tcp maxwin on re-register

Martin Willi (1):
netfilter: xt_cluster: add dependency on conntrack module

Michal 'vorner' Vaner (1):
netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEAT

Pablo Neira Ayuso (2):
netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUT
netfilter: cttimeout: ctnl_timeout_find_get() returns incorrect pointer to type

Taehee Yoo (1):
netfilter: nf_tables: release chain in flushing set

Yue Haibing (1):
netfilter: conntrack: remove duplicated include from nf_conntrack_proto_udp.c

 include/net/netfilter/nf_conntrack_timeout.h |  2 +-
 net/ipv4/netfilter/Kconfig                   |  8 ++--
 net/netfilter/Kconfig                        | 12 +++---
 net/netfilter/nf_conntrack_proto.c           | 26 ++++++++++++
 net/netfilter/nf_conntrack_proto_dccp.c      | 19 ++++++---
 net/netfilter/nf_conntrack_proto_generic.c   |  8 ++--
 net/netfilter/nf_conntrack_proto_gre.c       |  8 ++--
 net/netfilter/nf_conntrack_proto_icmp.c      |  8 ++--
 net/netfilter/nf_conntrack_proto_icmpv6.c    |  8 ++--
 net/netfilter/nf_conntrack_proto_sctp.c      | 21 ++++++----
 net/netfilter/nf_conntrack_proto_tcp.c       | 19 ++++++---
 net/netfilter/nf_conntrack_proto_udp.c       | 21 +++++-----
 net/netfilter/nf_tables_api.c                |  1 +
 net/netfilter/nfnetlink_cttimeout.c          |  6 +--
 net/netfilter/nfnetlink_queue.c              |  1 +
 net/netfilter/nft_ct.c                       | 59 ++++++++++++++--------------
 net/netfilter/xt_CHECKSUM.c                  | 22 ++++++++++-
 net/netfilter/xt_cluster.c                   | 14 ++++++-
 net/netfilter/xt_hashlimit.c                 | 18 ++++-----
 19 files changed, 181 insertions(+), 100 deletions(-)