Skip to content

Netfilter updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest13 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13netfilter: ip6t_NPT: rewrite addresses in ICMPv6 original packetnet/ipv6/netfilter/ip6t_NPT.c+39 -00 replies
2/13ipvs: Fix uninit-value in do_ip_vs_set_ctl()net/netfilter/ipvs/ip_vs_ctl.c+4 -30 replies
3/13netfilter: nf_tables: add userdata attributes to nft_tableinclude/net/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+25 -10 replies
4/13netfilter: conntrack: do not increment two error counters at same timenet/netfilter/nf_conntrack_core.c+1 -40 replies
5/13netfilter: conntrack: remove ignore statsinclude/linux/netfilter/nf_conntrack_common.h include/uapi/linux/netfilter/nfnetlink_conntrack.h net/netfilter/nf_conntrack_core.c +2 more+3 -70 replies
6/13netfilter: conntrack: add clash resolution stat counterinclude/linux/netfilter/nf_conntrack_common.h include/uapi/linux/netfilter/nfnetlink_conntrack.h net/netfilter/nf_conntrack_core.c +2 more+11 -60 replies
7/13netfilter: conntrack: remove unneeded nf_ct_putnet/netfilter/nf_conntrack_core.c+3 -40 replies
8/13netfilter: xt_HMARK: Use ip_is_fragment() helpernet/netfilter/xt_HMARK.c+1 -10 replies
9/13netfilter: nft_socket: add wildcard supportinclude/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_socket.c+29 -00 replies
10/13ipvs: remove dependency on ip6_tablesinclude/net/ip_vs.h net/netfilter/ipvs/Kconfig+0 -40 replies
11/13netfilter: ebt_stp: Remove unused macro BPDU_TYPE_TCNnet/bridge/netfilter/ebt_stp.c+0 -10 replies
12/13selftests/net: replace obsolete NFT_CHAIN configurationtools/testing/selftests/net/config+1 -20 replies
13/13netfilter: nf_tables: add userdata support for nft_objectinclude/net/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+31 -80 replies

Reviews trailers per patch

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

PatchJulian AnastasovSimon Horman
1/13
2/13A-b R-b
3/13
4/13
5/13
6/13
7/13
8/13
9/13
10/13A-b
11/13
12/13
13/13

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 00/13] Netfilter updates for net-next

Hi,

The following patchset contains Netfilter updates for net-next:

1) Rewrite inner header IPv6 in ICMPv6 messages in ip6t_NPT, from Michael Zhou.

2) do_ip_vs_set_ctl() dereferences uninitialized value, from Peilin Ye.

3) Support for userdata in tables, from Jose M. Guisado.

4) Do not increment ct error and invalid stats at the same time, from Florian Westphal.

5) Remove ct ignore stats, also from Florian.

6) Add ct stats for clash resolution, from Florian Westphal.

7) Bump reference counter bump on ct clash resolution only, this is safe because bucket lock is held, again from Florian.

8) Use ip_is_fragment() in xt_HMARK, from YueHaibing.

9) Add wildcard support for nft_socket, from Balazs Scheidler.

10) Remove superfluous IPVS dependency on iptables, from Yaroslav Bolyukin.

11) Remove unused definition in ebt_stp, from Wang Hai.

12) Replace CONFIG_NFT_CHAIN_NAT_{IPV4,IPV6} by CONFIG_NFT_NAT in selftests/net, from Fabian Frederick.

13) Add userdata support for nft_object, from Jose M. Guisado.

Please, pull these changes from:

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

Thank you.

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

The following changes since commit 0f091e43310f5c292b7094f9f115e651358e8053:

netlabel: remove unused param from audit_log_format() (2020-08-28 09:08:51 -0700)

are available in the Git repository at:

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

for you to fetch changes up to b131c96496b369c7b14125e7c50e89ac7cec8051:

netfilter: nf_tables: add userdata support for nft_object (2020-09-08 16:35:38 +0200)

----------------------------------------------------------------
Balazs Scheidler (1):
netfilter: nft_socket: add wildcard support

Fabian Frederick (1):
selftests/net: replace obsolete NFT_CHAIN configuration

Florian Westphal (4):
netfilter: conntrack: do not increment two error counters at same time
netfilter: conntrack: remove ignore stats
netfilter: conntrack: add clash resolution stat counter
netfilter: conntrack: remove unneeded nf_ct_put

Jose M. Guisado Gomez (2):
netfilter: nf_tables: add userdata attributes to nft_table
netfilter: nf_tables: add userdata support for nft_object

Michael Zhou (1):
netfilter: ip6t_NPT: rewrite addresses in ICMPv6 original packet

Peilin Ye (1):
ipvs: Fix uninit-value in do_ip_vs_set_ctl()

Wang Hai (1):
netfilter: ebt_stp: Remove unused macro BPDU_TYPE_TCN

Yaroslav Bolyukin (1):
ipvs: remove dependency on ip6_tables

YueHaibing (1):
netfilter: xt_HMARK: Use ip_is_fragment() helper

 include/linux/netfilter/nf_conntrack_common.h      |  2 +-
 include/net/ip_vs.h                                |  3 --
 include/net/netfilter/nf_tables.h                  |  4 ++
 include/uapi/linux/netfilter/nf_tables.h           |  6 +++
 include/uapi/linux/netfilter/nfnetlink_conntrack.h |  3 +-
 net/bridge/netfilter/ebt_stp.c                     |  1 -
 net/ipv6/netfilter/ip6t_NPT.c                      | 39 +++++++++++++++
 net/netfilter/ipvs/Kconfig                         |  1 -
 net/netfilter/ipvs/ip_vs_ctl.c                     |  7 +--
 net/netfilter/nf_conntrack_core.c                  | 25 ++++------
 net/netfilter/nf_conntrack_netlink.c               |  5 +-
 net/netfilter/nf_conntrack_standalone.c            |  4 +-
 net/netfilter/nf_tables_api.c                      | 57 ++++++++++++++++++----
 net/netfilter/nft_socket.c                         | 27 ++++++++++
 net/netfilter/xt_HMARK.c                           |  2 +-
 tools/testing/selftests/net/config                 |  3 +-
 16 files changed, 148 insertions(+), 41 deletions(-)