Skip to content

Netfilter/IPVS updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 5 repliesApplied 15/15

Patches in v1 All 15 applied

#Subject and filesSizeRepliesApplied
1/15ipvs: add conn_max sysctl to limit connectionsDocumentation/networking/ipvs-sysctl.rst include/net/ip_vs.h net/netfilter/ipvs/ip_vs_conn.c +1 more+119 -10 repliesApplied
2/15netfilter: nfnetlink_osf: fix mss parsing on big-endian architecturesnet/netfilter/nfnetlink_osf.c+1 -50 repliesApplied
3/15netfilter: nfnetlink_cthelper: use {READ,WRITE}_ONCE for accessing helper flagsnet/netfilter/nf_conntrack_core.c net/netfilter/nfnetlink_cthelper.c+16 -80 repliesApplied
4/15netfilter: synproxy: drop packets if timestamp adjustment failsnet/netfilter/nf_synproxy_core.c+13 -90 repliesApplied
5/15netfilter: synproxy: adjust duplicate timestamp optionsnet/netfilter/nf_synproxy_core.c+0 -10 repliesApplied
6/15netfilter: synproxy: fix unaligned memory access in timestamp adjustmentnet/netfilter/nf_synproxy_core.c+9 -100 repliesApplied
7/15netfilter: synproxy: protect nf_ct_seqadj_init() with conntrack locknet/netfilter/nf_conntrack_seqadj.c+2 -00 repliesApplied
8/15netfilter: cttimeout: detach dataplane timeout policy and repurpose refcountinclude/net/netfilter/nf_conntrack_timeout.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_timeout.c +3 more+107 -743 repliesApplied
9/15netfilter: nf_conntrack_helper: dynamically allocate struct nf_conntrack_helperinclude/net/netfilter/nf_conntrack_helper.h net/ipv4/netfilter/nf_nat_snmp_basic_main.c net/netfilter/nf_conntrack_amanda.c +11 more+210 -1890 repliesApplied
10/15netfilter: nf_conntrack_pptp: move GRE specific cleanup to GRE trackerinclude/net/netfilter/ipv4/nf_conntrack_ipv4.h net/netfilter/nf_conntrack_pptp.c net/netfilter/nf_conntrack_proto_gre.c+67 -610 repliesApplied
11/15netfilter: nf_conntrack_helper: add refcounting from datapathinclude/net/netfilter/nf_conntrack_helper.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_helper.c +6 more+89 -640 repliesApplied
12/15netfilter: conntrack: revert ct extension genid infrastructureinclude/net/netfilter/nf_conntrack_extend.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_extend.c+2 -1030 repliesApplied
13/15netfilter: conntrack: call nf_ct_gre_keymap_destroy() if master helper is pptpnet/netfilter/nf_conntrack_core.c+16 -20 repliesApplied
14/15netfilter: flowtable: avoid num_encaps underflow on bridge VLAN untagnet/netfilter/nf_flow_table_path.c+2 -10 repliesApplied
15/15netfilter: nf_conntrack: use get_unaligned_be32() in tcp_sack()net/netfilter/nf_conntrack_proto_tcp.c+5 -50 repliesApplied

Reviews trailers per patch

2 of 15 patches have a Reviewed-by or Acked-by.

PatchFernando Fernandez Mancera
1/15
2/15
3/15
4/15
5/15
6/15
7/15
8/15
9/15
10/15
11/15
12/15
13/15
14/15R-b
15/15R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 00/15] Netfilter/IPVS updates for net-next

Hi,

The following patchset contains Netfilter/IPVS updates for net-next, this contains updates to address sashiko reports in IPVS and Netfilter on possible pre-existing issues. This also includes a series to add refcount for ct helper and timeout to deal with a corner case scenario with unconfirmed conntracks flying to nfqueue.

1) Add a conn_max sysctl to IPVS to limit the maximum number of connections, from Julian Anastasov.

2) Use get_unaligned_be16() to access TCP MSS in nfnetlink_osf, from Fernando Fernandez Mancera.

3) Use {READ,WRITE}_ONCE to access helper flags from nfnetlink_helper.

Several patches for the synproxy infrastructure, from Fernando Fernandez Mancera:

4) Drop packet if TCP timestamp adjustment fails.

5) Continue parsing of TCP timestamp to deal with possible duplicates.

6) Use {get,put}_unaligned_be32() to acess the TCP timestamp.

7) Hold ct->lock to initialize nf_ct_seqadj_init().

Updates for the ct timeout infrastructure, to deal with a corner case for unconfirmed conntracks flying to nfqueue:

8) Add a refcount to track ct timeout policy use by ct extension, release the timeout until the last ct extension drops the refcnt on it.

Similar update for the ct helper infrastructure:

9) Dynamic allocation of ct helpers, as a preparation for adding refcount to track ct extension use.

10) Move destroy_sibling_or_exp() to nf_conntrack_proto_gre, so pptp conntrack helper module removal does not make this code unreachable via the helper->destroy callback. This is another dependency for the new refcount coming in this series.

11) Add a refcount to track use of it from the ct extension, then ct helper and timeout is reachable to the connection until it goes away.

12) Remove the genid infrastructure in ct extensions. The primary goal was to detect that a ct extension such as ct timeout and ct helper went stale for unconfirmed conntrack, either because object or module was removed. This deactivates all ct extensions though for this unconfirmed conntrack.

13) Call nf_ct_gre_keymap_destroy() if this is a master conntrack with a pptp helper only.

sashiko.dev reports one more relevant issue when unsetting the helper via ctnetlink that I will address in a follow up patch.

Then, two more assorted updates:

14) Avoid a unlikely underflow in bridge VLAN untag, only possible if buggy bridge VLAN filtering is buggy, remove WARN_ON_ONCE while at it. From David Carlier.

15) Use get_unaligned_be32() in nf_conntrack_tcp to access sack extension, from Rosen Penev.

Please, pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git nf-next-26-06-07

Thanks.

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

The following changes since commit bfa3d89cc15c09f7d1581c834a5ed725189ec19f:

Merge tag 'batadv-next-pullrequest-20260603' of https://git.open-mesh.org/batadv (2026-06-04 19:14:35 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-26-06-07

for you to fetch changes up to d3bf9eae486490832bd08fd62ab0ac601f346bd4:

netfilter: nf_conntrack: use get_unaligned_be32() in tcp_sack() (2026-06-07 11:13:47 +0200)

----------------------------------------------------------------
netfilter pull request 26-06-07

----------------------------------------------------------------
David Carlier (1):
netfilter: flowtable: avoid num_encaps underflow on bridge VLAN untag

Fernando Fernandez Mancera (5):
netfilter: nfnetlink_osf: fix mss parsing on big-endian architectures
netfilter: synproxy: drop packets if timestamp adjustment fails
netfilter: synproxy: adjust duplicate timestamp options
netfilter: synproxy: fix unaligned memory access in timestamp adjustment
netfilter: synproxy: protect nf_ct_seqadj_init() with conntrack lock

Julian Anastasov (1):
ipvs: add conn_max sysctl to limit connections

Pablo Neira Ayuso (7):
netfilter: nfnetlink_cthelper: use {READ,WRITE}_ONCE for accessing helper flags
netfilter: cttimeout: detach dataplane timeout policy and repurpose refcount
netfilter: nf_conntrack_helper: dynamically allocate struct nf_conntrack_helper
netfilter: nf_conntrack_pptp: move GRE specific cleanup to GRE tracker
netfilter: nf_conntrack_helper: add refcounting from datapath
netfilter: conntrack: revert ct extension genid infrastructure
netfilter: conntrack: call nf_ct_gre_keymap_destroy() if master helper is pptp

Rosen Penev (1):
netfilter: nf_conntrack: use get_unaligned_be32() in tcp_sack()

 Documentation/networking/ipvs-sysctl.rst       |  35 +++++++
 include/net/ip_vs.h                            |  22 +++++
 include/net/netfilter/ipv4/nf_conntrack_ipv4.h |   4 +
 include/net/netfilter/nf_conntrack_extend.h    |  12 ---
 include/net/netfilter/nf_conntrack_helper.h    |  42 ++++++---
 include/net/netfilter/nf_conntrack_timeout.h   |  27 +++++-
 net/ipv4/netfilter/nf_nat_snmp_basic_main.c    |  27 +++---
 net/netfilter/ipvs/ip_vs_conn.c                |  10 +-
 net/netfilter/ipvs/ip_vs_ctl.c                 |  53 +++++++++++
 net/netfilter/nf_conntrack_amanda.c            |  39 +++-----
 net/netfilter/nf_conntrack_core.c              |  92 +++++-------------
 net/netfilter/nf_conntrack_extend.c            |  32 +------
 net/netfilter/nf_conntrack_ftp.c               |   5 +-
 net/netfilter/nf_conntrack_h323_main.c         | 107 +++++++++------------
 net/netfilter/nf_conntrack_helper.c            | 125 +++++++++++++++++--------
 net/netfilter/nf_conntrack_irc.c               |   5 +-
 net/netfilter/nf_conntrack_netbios_ns.c        |  20 ++--
 net/netfilter/nf_conntrack_netlink.c           |  28 ++++--
 net/netfilter/nf_conntrack_ovs.c               |   9 +-
 net/netfilter/nf_conntrack_pptp.c              |  83 +++-------------
 net/netfilter/nf_conntrack_proto.c             |  15 ++-
 net/netfilter/nf_conntrack_proto_gre.c         |  61 ++++++++++++
 net/netfilter/nf_conntrack_proto_tcp.c         |  10 +-
 net/netfilter/nf_conntrack_sane.c              |   5 +-
 net/netfilter/nf_conntrack_seqadj.c            |   2 +
 net/netfilter/nf_conntrack_sip.c               |   5 +-
 net/netfilter/nf_conntrack_snmp.c              |  21 ++---
 net/netfilter/nf_conntrack_tftp.c              |   5 +-
 net/netfilter/nf_conntrack_timeout.c           |  27 +++++-
 net/netfilter/nf_flow_table_path.c             |   3 +-
 net/netfilter/nf_synproxy_core.c               |  40 ++++----
 net/netfilter/nfnetlink_cthelper.c             |  79 ++++++++--------
 net/netfilter/nfnetlink_cttimeout.c            | 112 ++++++++++------------
 net/netfilter/nfnetlink_osf.c                  |   6 +-
 net/netfilter/nft_ct.c                         |  10 +-
 net/netfilter/xt_CT.c                          |   3 -
 36 files changed, 653 insertions(+), 528 deletions(-)