Netfilter updates for net-next (v2)
Subsystems (12)
Pablo Neira Ayuso
maintainerv2: missing Signed-off-by: tags in patch 2/4 and 3/4.
-o-
Hi,
The following series contains an initial small batch of Netfilter updates for net-next:
1) Remove DCCP conntrack support, keep DCCP matches around in order to avoid breakage when loading ruleset, add Kconfig to wrap the code so it can be disabled by distributors.
2) Remove buggy code aiming at shrinking netlink deletion event, then re-add it correctly in another patch. This is to prevent -stable to pick up on a fix that breaks old userspace. From Phil Sutter.
3) Missing WARN_ON_ONCE() to check for lockdep_commit_lock_is_held() to uncover bugs. From Fedor Pchelkin.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git nf-next-25-07-10
Thanks
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git nf-next-25-07-10
Thanks.
----------------------------------------------------------------
The following changes since commit 8b98f34ce1d8c520403362cb785231f9898eb3ff:
net: ipv6: Fix spelling mistake (2025-07-02 15:42:29 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-25-07-10
for you to fetch changes up to 8df1b40de76979bb8e975201d07b71103d5de820:
netfilter: nf_tables: adjust lockdep assertions handling (2025-07-10 03:01:22 +0200)
----------------------------------------------------------------
netfilter pull request 25-07-10
----------------------------------------------------------------
Fedor Pchelkin (1):
netfilter: nf_tables: adjust lockdep assertions handling
Pablo Neira Ayuso (1):
netfilter: conntrack: remove DCCP protocol support
Phil Sutter (2):
netfilter: nf_tables: Drop dead code from fill_*_info routines
netfilter: nf_tables: Reintroduce shortened deletion notifications
Documentation/networking/nf_conntrack-sysctl.rst | 1 - arch/arm/configs/omap2plus_defconfig | 1 - arch/loongarch/configs/loongson3_defconfig | 1 - arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/mips/configs/fuloong2e_defconfig | 1 - arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/loongson2k_defconfig | 1 - arch/mips/configs/loongson3_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/rb532_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - arch/powerpc/configs/cell_defconfig | 1 - arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - include/linux/netfilter/nf_conntrack_dccp.h | 38 -- include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 - include/net/netfilter/nf_conntrack.h | 2 - include/net/netfilter/nf_conntrack_l4proto.h | 13 - include/net/netfilter/nf_reject.h | 1 - include/net/netns/conntrack.h | 13 - net/netfilter/Kconfig | 20 +- net/netfilter/Makefile | 1 - net/netfilter/nf_conntrack_core.c | 8 - net/netfilter/nf_conntrack_netlink.c | 1 - net/netfilter/nf_conntrack_proto.c | 6 - net/netfilter/nf_conntrack_proto_dccp.c | 826 ----------------------- net/netfilter/nf_conntrack_standalone.c | 92 --- net/netfilter/nf_nat_core.c | 6 - net/netfilter/nf_nat_proto.c | 43 -- net/netfilter/nf_tables_api.c | 56 +- net/netfilter/nfnetlink_cttimeout.c | 5 - net/netfilter/nft_exthdr.c | 8 + 46 files changed, 48 insertions(+), 1122 deletions(-) delete mode 100644 include/linux/netfilter/nf_conntrack_dccp.h delete mode 100644 net/netfilter/nf_conntrack_proto_dccp.c
Pablo Neira Ayuso
maintainerPATCH 1/4 netfilter: conntrack: remove DCCP protocol support
The DCCP socket family has now been removed from this tree, see:
8bb3212be4b4 ("Merge branch 'net-retire-dccp-socket'")
Remove connection tracking and NAT support for this protocol, this should not pose a problem because no DCCP traffic is expected to be seen on the wire.
As for the code for matching on dccp header for iptables and nftables, mark it as deprecated and keep it in place. Ruleset restoration is an atomic operation. Without dccp matching support, an astray match on dccp could break this operation leaving your computer with no policy in place, so let's follow a more conservative approach for matches.
Add CONFIG_NFT_EXTHDR_DCCP which is set to 'n' by default to deprecate dccp extension support. Similarly, label CONFIG_NETFILTER_XT_MATCH_DCCP as deprecated too and also set it to 'n' by default.
Code to match on DCCP protocol from ebtables also remains in place, this is just a few checks on IPPROTO_DCCP from _check() path which is exercised when ruleset is loaded. There is another use of IPPROTO_DCCP from the _check() path in the iptables multiport match. Another check for IPPROTO_DCCP from the packet in the reject target is also removed.
So let's schedule removal of the dccp matching for a second stage, this should not interfer with the dccp retirement since this is only matching on the dccp header.
--- .../networking/nf_conntrack-sysctl.rst | 1 - arch/arm/configs/omap2plus_defconfig | 1 - arch/loongarch/configs/loongson3_defconfig | 1 - arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/mips/configs/fuloong2e_defconfig | 1 - arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/loongson2k_defconfig | 1 - arch/mips/configs/loongson3_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/rb532_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - arch/powerpc/configs/cell_defconfig | 1 - arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - include/linux/netfilter/nf_conntrack_dccp.h | 38 - .../net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 - include/net/netfilter/nf_conntrack.h | 2 - include/net/netfilter/nf_conntrack_l4proto.h | 13 - include/net/netfilter/nf_reject.h | 1 - include/net/netns/conntrack.h | 13 - net/netfilter/Kconfig | 20 +- net/netfilter/Makefile | 1 - net/netfilter/nf_conntrack_core.c | 8 - net/netfilter/nf_conntrack_netlink.c | 1 - net/netfilter/nf_conntrack_proto.c | 6 - net/netfilter/nf_conntrack_proto_dccp.c | 826 ------------------ net/netfilter/nf_conntrack_standalone.c | 92 -- net/netfilter/nf_nat_core.c | 6 - net/netfilter/nf_nat_proto.c | 43 - net/netfilter/nfnetlink_cttimeout.c | 5 - net/netfilter/nft_exthdr.c | 8 + 45 files changed, 16 insertions(+), 1098 deletions(-) delete mode 100644 include/linux/netfilter/nf_conntrack_dccp.h delete mode 100644 net/netfilter/nf_conntrack_proto_dccp.c
Documentation/networking/nf_conntrack-sysctl.rst +0 -1
@@ -85,7 +85,6 @@ nf_conntrack_log_invalid - INTEGER - 1 - log ICMP packets - 6 - log TCP packets - 17 - log UDP packets - - 33 - log DCCP packets - 41 - log ICMPv6 packets - 136 - log UDPLITE packets - 255 - log packets of any protocol
arch/arm/configs/omap2plus_defconfig +0 -1
@@ -142,7 +142,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/loongarch/configs/loongson3_defconfig +0 -1
@@ -225,7 +225,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/m68k/configs/amiga_defconfig +0 -1
@@ -85,7 +85,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/apollo_defconfig +0 -1
@@ -81,7 +81,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/atari_defconfig +0 -1
@@ -88,7 +88,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/bvme6000_defconfig +0 -1
@@ -78,7 +78,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/hp300_defconfig +0 -1
@@ -80,7 +80,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/mac_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/multi_defconfig +0 -1
@@ -99,7 +99,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/mvme147_defconfig +0 -1
@@ -77,7 +77,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/mvme16x_defconfig +0 -1
@@ -78,7 +78,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/q40_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/sun3_defconfig +0 -1
@@ -74,7 +74,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/m68k/configs/sun3x_defconfig +0 -1
@@ -75,7 +75,6 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m
arch/mips/configs/fuloong2e_defconfig +0 -1
@@ -44,7 +44,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m
arch/mips/configs/ip22_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
arch/mips/configs/loongson2k_defconfig +0 -1
@@ -52,7 +52,6 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m
arch/mips/configs/loongson3_defconfig +0 -1
@@ -72,7 +72,6 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m
arch/mips/configs/malta_defconfig +0 -1
@@ -80,7 +80,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m
arch/mips/configs/malta_kvm_defconfig +0 -1
@@ -84,7 +84,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m
arch/mips/configs/maltaup_xpa_defconfig +0 -1
@@ -82,7 +82,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m
arch/mips/configs/rb532_defconfig +0 -1
@@ -56,7 +56,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
arch/mips/configs/rm200_defconfig +0 -1
@@ -64,7 +64,6 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
arch/powerpc/configs/cell_defconfig +0 -1
@@ -62,7 +62,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
arch/s390/configs/debug_defconfig +0 -1
@@ -248,7 +248,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/s390/configs/defconfig +0 -1
@@ -239,7 +239,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/sh/configs/titan_defconfig +0 -1
@@ -61,7 +61,6 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m
include/linux/netfilter/nf_conntrack_dccp.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _NF_CONNTRACK_DCCP_H -#define _NF_CONNTRACK_DCCP_H - -/* Exposed to userspace over nfnetlink */ -enum ct_dccp_states { -CT_DCCP_NONE , -CT_DCCP_REQUEST , -CT_DCCP_RESPOND , -CT_DCCP_PARTOPEN , -CT_DCCP_OPEN , -CT_DCCP_CLOSEREQ , -CT_DCCP_CLOSING , -CT_DCCP_TIMEWAIT , -CT_DCCP_IGNORE , -CT_DCCP_INVALID , - __CT_DCCP_MAX -}; -#define CT_DCCP_MAX (__CT_DCCP_MAX - 1) - -enum ct_dccp_roles { -CT_DCCP_ROLE_CLIENT , -CT_DCCP_ROLE_SERVER , - __CT_DCCP_ROLE_MAX -}; -#define CT_DCCP_ROLE_MAX (__CT_DCCP_ROLE_MAX - 1) - -#include <linux/netfilter/nf_conntrack_tuple_common.h> - -struct nf_ct_dccp { -u_int8_t role[IP_CT_DIR_MAX ]; -u_int8_t state; -u_int8_t last_pkt; -u_int8_t last_dir; -u_int64_t handshake_seq; -}; - -#endif /* _NF_CONNTRACK_DCCP_H */
include/net/netfilter/ipv4/nf_conntrack_ipv4.h +0 -3
@@ -13,9 +13,6 @@extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp;extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp;extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; -#ifdef CONFIG_NF_CT_PROTO_DCCP -extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp; -#endif #ifdef CONFIG_NF_CT_PROTO_SCTP extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp;#endif
include/net/netfilter/nf_conntrack.h +0 -2
@@ -18,7 +18,6 @@#include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_tcp.h> -#include <linux/netfilter/nf_conntrack_dccp.h> #include <linux/netfilter/nf_conntrack_sctp.h> #include <linux/netfilter/nf_conntrack_proto_gre.h>
@@ -31,7 +30,6 @@ struct nf_ct_udp {/* per conntrack: protocol private data */ union nf_conntrack_proto {/* insert conntrack proto private data here */ -struct nf_ct_dccp dccp;struct ip_ct_sctp sctp;struct ip_ct_tcp tcp;struct nf_ct_udp udp;
include/net/netfilter/nf_conntrack_l4proto.h +0 -13
@@ -117,11 +117,6 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,unsigned int dataoff, enum ip_conntrack_info ctinfo, const struct nf_hook_state *state); -int nf_conntrack_dccp_packet (struct nf_conn *ct, -struct sk_buff *skb, -unsigned int dataoff, -enum ip_conntrack_info ctinfo, -const struct nf_hook_state *state); int nf_conntrack_sctp_packet(struct nf_conn *ct, struct sk_buff *skb, unsigned int dataoff,
@@ -137,7 +132,6 @@ void nf_conntrack_generic_init_net(struct net *net);void nf_conntrack_tcp_init_net (struct net *net);void nf_conntrack_udp_init_net (struct net *net);void nf_conntrack_gre_init_net (struct net *net); -void nf_conntrack_dccp_init_net (struct net *net);void nf_conntrack_sctp_init_net (struct net *net);void nf_conntrack_icmp_init_net (struct net *net);void nf_conntrack_icmpv6_init_net (struct net *net);
@@ -223,13 +217,6 @@ static inline bool nf_conntrack_tcp_established(const struct nf_conn *ct) }#endif -#ifdef CONFIG_NF_CT_PROTO_DCCP -static inline struct nf_dccp_net *nf_dccp_pernet (struct net *net) -{ -return &net->ct.nf_ct_proto.dccp; -} -#endif -#ifdef CONFIG_NF_CT_PROTO_SCTP static inline struct nf_sctp_net *nf_sctp_pernet (struct net *net) {
include/net/netfilter/nf_reject.h +0 -1
@@ -34,7 +34,6 @@ static inline bool nf_reject_verify_csum(struct sk_buff *skb, int dataoff,/* Protocols with partial checksums. */ case IPPROTO_UDPLITE : -case IPPROTO_DCCP :return false; }return true;
include/net/netns/conntrack.h +0 -13
@@ -7,9 +7,6 @@#include <linux/atomic.h> #include <linux/workqueue.h> #include <linux/netfilter/nf_conntrack_tcp.h> -#ifdef CONFIG_NF_CT_PROTO_DCCP -#include <linux/netfilter/nf_conntrack_dccp.h> -#endif #ifdef CONFIG_NF_CT_PROTO_SCTP #include <linux/netfilter/nf_conntrack_sctp.h> #endif
@@ -50,13 +47,6 @@ struct nf_icmp_net {unsigned int timeout; }; -#ifdef CONFIG_NF_CT_PROTO_DCCP -struct nf_dccp_net { -u8 dccp_loose; -unsigned int dccp_timeout[CT_DCCP_MAX +1 ]; -}; -#endif - #ifdef CONFIG_NF_CT_PROTO_SCTP struct nf_sctp_net { unsigned int timeouts[SCTP_CONNTRACK_MAX];
@@ -82,9 +72,6 @@ struct nf_ip_net {struct nf_udp_net udp;struct nf_icmp_net icmp;struct nf_icmp_net icmpv6; -#ifdef CONFIG_NF_CT_PROTO_DCCP -struct nf_dccp_net dccp; -#endif #ifdef CONFIG_NF_CT_PROTO_SCTP struct nf_sctp_net sctp;#endif
net/netfilter/Kconfig +8 -12
@@ -195,16 +195,6 @@ config NF_CONNTRACK_LABELS config NF_CONNTRACK_OVS bool -config NF_CT_PROTO_DCCP - bool 'DCCP protocol connection tracking support' - depends on NETFILTER_ADVANCED - default y - help - With this option enabled, the layer 3 independent connection - tracking code will be able to do state tracking on DCCP connections. - - If unsure, say Y. - config NF_CT_PROTO_GRE bool
@@ -516,6 +506,12 @@ config NFT_CT This option adds the "ct" expression that you can use to match connection tracking information such as the flow state. +config NFT_EXTHDR_DCCP + bool "Netfilter nf_tables exthdr DCCP support (DEPRECATED)" + default n + help + This option adds support for matching on DCCP extension headers. + config NFT_FLOW_OFFLOAD depends on NF_CONNTRACK && NF_FLOW_TABLE tristate "Netfilter nf_tables hardware flow offload module"
@@ -1278,9 +1274,9 @@ config NETFILTER_XT_MATCH_CPU To compile it as a module, choose M here. If unsure, say N. config NETFILTER_XT_MATCH_DCCP - tristate '"dccp" protocol match support' + tristate '"dccp" protocol match support (DEPRECATED)' depends on NETFILTER_ADVANCED - default IP_DCCP + default n help With this option enabled, you will be able to use the iptables `dccp' match in order to match on DCCP source/destination ports
net/netfilter/Makefile +0 -1
@@ -12,7 +12,6 @@ nf_conntrack-$(CONFIG_NF_CONNTRACK_TIMESTAMP) += nf_conntrack_timestamp.o nf_conntrack-$(CONFIG_NF_CONNTRACK_EVENTS) += nf_conntrack_ecache.o nf_conntrack-$(CONFIG_NF_CONNTRACK_LABELS) += nf_conntrack_labels.o nf_conntrack-$(CONFIG_NF_CONNTRACK_OVS) += nf_conntrack_ovs.o -nf_conntrack-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o nf_conntrack-$(CONFIG_NF_CT_PROTO_SCTP) += nf_conntrack_proto_sctp.o nf_conntrack-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o ifeq ($(CONFIG_NF_CONNTRACK),m)
net/netfilter/nf_conntrack_core.c +0 -8
@@ -328,9 +328,6 @@ nf_ct_get_tuple(const struct sk_buff *skb,#endif #ifdef CONFIG_NF_CT_PROTO_SCTP case IPPROTO_SCTP : -#endif -#ifdef CONFIG_NF_CT_PROTO_DCCP -case IPPROTO_DCCP :#endif /* fallthrough */ return nf_ct_get_tuple_ports (skb, dataoff, tuple);
@@ -1982,11 +1979,6 @@ static int nf_conntrack_handle_packet(struct nf_conn *ct,return nf_conntrack_sctp_packet (ct, skb, dataoff, ctinfo, state);#endif -#ifdef CONFIG_NF_CT_PROTO_DCCP -case IPPROTO_DCCP : -return nf_conntrack_dccp_packet (ct, skb, dataoff, - ctinfo, state); -#endif #ifdef CONFIG_NF_CT_PROTO_GRE case IPPROTO_GRE : return nf_conntrack_gre_packet(ct, skb, dataoff,
net/netfilter/nf_conntrack_netlink.c +0 -1
@@ -2036,7 +2036,6 @@ static void ctnetlink_change_mark(struct nf_conn *ct,static const struct nla_policy protoinfo_policy[CTA_PROTOINFO_MAX +1 ] = { [CTA_PROTOINFO_TCP ] = { .type =NLA_NESTED }, - [CTA_PROTOINFO_DCCP ] = { .type =NLA_NESTED }, [CTA_PROTOINFO_SCTP ] = { .type =NLA_NESTED }, };
net/netfilter/nf_conntrack_proto.c +0 -6
@@ -100,9 +100,6 @@ const struct nf_conntrack_l4proto *nf_ct_l4proto_find(u8 l4proto)case IPPROTO_UDP :return &nf_conntrack_l4proto_udp;case IPPROTO_TCP :return &nf_conntrack_l4proto_tcp;case IPPROTO_ICMP :return &nf_conntrack_l4proto_icmp; -#ifdef CONFIG_NF_CT_PROTO_DCCP -case IPPROTO_DCCP :return &nf_conntrack_l4proto_dccp; -#endif #ifdef CONFIG_NF_CT_PROTO_SCTP case IPPROTO_SCTP :return &nf_conntrack_l4proto_sctp;#endif
@@ -681,9 +678,6 @@ void nf_conntrack_proto_pernet_init(struct net *net)#if IS_ENABLED (CONFIG_IPV6 )nf_conntrack_icmpv6_init_net (net);#endif -#ifdef CONFIG_NF_CT_PROTO_DCCP -nf_conntrack_dccp_init_net (net); -#endif #ifdef CONFIG_NF_CT_PROTO_SCTP nf_conntrack_sctp_init_net (net);#endif
net/netfilter/nf_conntrack_proto_dccp.c deleted +0 -826
826 lines not on this page · raw message
net/netfilter/nf_conntrack_standalone.c +0 -92
128 lines not on this page · raw message
net/netfilter/nf_nat_core.c +0 -6
@@ -69,7 +69,6 @@ static void nf_nat_ipv4_decode_session(struct sk_buff *skb,if (t->dst.protonum ==IPPROTO_TCP || t->dst.protonum ==IPPROTO_UDP || t->dst.protonum ==IPPROTO_UDPLITE || - t->dst.protonum ==IPPROTO_DCCP || t->dst.protonum ==IPPROTO_SCTP ) fl4->fl4_dport = t->dst.u.all; }
@@ -81,7 +80,6 @@ static void nf_nat_ipv4_decode_session(struct sk_buff *skb,if (t->dst.protonum ==IPPROTO_TCP || t->dst.protonum ==IPPROTO_UDP || t->dst.protonum ==IPPROTO_UDPLITE || - t->dst.protonum ==IPPROTO_DCCP || t->dst.protonum ==IPPROTO_SCTP ) fl4->fl4_sport = t->src.u.all; }
@@ -102,7 +100,6 @@ static void nf_nat_ipv6_decode_session(struct sk_buff *skb,if (t->dst.protonum ==IPPROTO_TCP || t->dst.protonum ==IPPROTO_UDP || t->dst.protonum ==IPPROTO_UDPLITE || - t->dst.protonum ==IPPROTO_DCCP || t->dst.protonum ==IPPROTO_SCTP ) fl6->fl6_dport = t->dst.u.all; }
@@ -114,7 +111,6 @@ static void nf_nat_ipv6_decode_session(struct sk_buff *skb,if (t->dst.protonum ==IPPROTO_TCP || t->dst.protonum ==IPPROTO_UDP || t->dst.protonum ==IPPROTO_UDPLITE || - t->dst.protonum ==IPPROTO_DCCP || t->dst.protonum ==IPPROTO_SCTP ) fl6->fl6_sport = t->src.u.all; }
@@ -432,7 +428,6 @@ static bool l4proto_in_range(const struct nf_conntrack_tuple *tuple,case IPPROTO_TCP :case IPPROTO_UDP :case IPPROTO_UDPLITE : -case IPPROTO_DCCP :case IPPROTO_SCTP :if (maniptype ==NF_NAT_MANIP_SRC ) port = tuple->src.u.all;
@@ -632,7 +627,6 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,case IPPROTO_UDPLITE :case IPPROTO_TCP :case IPPROTO_SCTP : -case IPPROTO_DCCP :if (maniptype ==NF_NAT_MANIP_SRC ) keyptr = &tuple->src.u.all;else
net/netfilter/nf_nat_proto.c +0 -43
55 lines not on this page · raw message
net/netfilter/nfnetlink_cttimeout.c +0 -5
@@ -461,11 +461,6 @@ static int cttimeout_default_get(struct sk_buff *skb,case IPPROTO_UDPLITE : timeouts =nf_udp_pernet (info->net)->timeouts;break ; -case IPPROTO_DCCP : -#ifdef CONFIG_NF_CT_PROTO_DCCP - timeouts =nf_dccp_pernet (info->net)->dccp_timeout; -#endif -break ;case IPPROTO_ICMPV6 : timeouts = &nf_icmpv6_pernet (info->net)->timeout;break ;
net/netfilter/nft_exthdr.c +8 -0
@@ -407,6 +407,7 @@ static void nft_exthdr_sctp_eval(const struct nft_expr *expr, regs->verdict.code =NFT_BREAK ; } +#ifdef CONFIG_NFT_EXTHDR_DCCP static void nft_exthdr_dccp_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -482,6 +483,7 @@ static void nft_exthdr_dccp_eval(const struct nft_expr *expr, err: *dest =0 ; } +#endif static const struct nla_policy nft_exthdr_policy[NFTA_EXTHDR_MAX +1 ] = { [NFTA_EXTHDR_DREG ] = { .type =NLA_U32 },
@@ -634,6 +636,7 @@ static int nft_exthdr_ipv4_init(const struct nft_ctx *ctx,return 0 ; } +#ifdef CONFIG_NFT_EXTHDR_DCCP static int nft_exthdr_dccp_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[])
@@ -649,6 +652,7 @@ static int nft_exthdr_dccp_init(const struct nft_ctx *ctx, return 0; } +#endif static int nft_exthdr_dump_common (struct sk_buff *skb,const struct nft_exthdr *priv) {
@@ -779,6 +783,7 @@ static const struct nft_expr_ops nft_exthdr_sctp_ops = { .reduce = nft_exthdr_reduce, }; +#ifdef CONFIG_NFT_EXTHDR_DCCP static const struct nft_expr_ops nft_exthdr_dccp_ops = { .type = &nft_exthdr_type, .size = NFT_EXPR_SIZE(sizeof(struct nft_exthdr)),
@@ -787,6 +792,7 @@ static const struct nft_expr_ops nft_exthdr_dccp_ops = { .dump = nft_exthdr_dump, .reduce = nft_exthdr_reduce, }; +#endif static const struct nft_expr_ops * nft_exthdr_select_ops(const struct nft_ctx *ctx,
@@ -822,10 +828,12 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx,if (tb[NFTA_EXTHDR_DREG ])return &nft_exthdr_sctp_ops;break ; +#ifdef CONFIG_NFT_EXTHDR_DCCP case NFT_EXTHDR_OP_DCCP :if (tb[NFTA_EXTHDR_DREG ])return &nft_exthdr_dccp_ops;break ; +#endif }return ERR_PTR (-EOPNOTSUPP );
Signature · 1 line
2.30.2
Re: [PATCH net-next 1/4] netfilter: conntrack: remove DCCP protocol support
This patch was applied to netdev/net-next.git (main) by Pablo Neira Ayuso <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Pablo Neira Ayuso <[email protected]>:
Quoted 9 lines · On Thu, 10 Jul 2025 03:07:03 +0200 you wrote:
The DCCP socket family has now been removed from this tree, see:
8bb3212be4b4("Merge branch 'net-retire-dccp-socket'")Remove connection tracking and NAT support for this protocol, this should not pose a problem because no DCCP traffic is expected to be seen on the wire.
[...]
Here is the summary with links:
- [net-next,1/4] netfilter: conntrack: remove DCCP protocol support
https://git.kernel.org/netdev/net-next/c/fd72f265bb00
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/4 netfilter: nf_tables: Drop dead code from fill_*_info routines
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
This practically reverts commit 28339b21a365 ("netfilter: nf_tables: do not send complete notification of deletions"): The feature was never effective, due to prior modification of 'event' variable the conditional early return never happened.
User space also relies upon the current behaviour, so better reintroduce the shortened deletion notifications once it is fixed.
--- net/netfilter/nf_tables_api.c | 25 ------------------------- 1 file changed, 25 deletions(-)
net/netfilter/nf_tables_api.c +0 -25
@@ -1165,11 +1165,6 @@ static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net, NFTA_TABLE_PAD)) goto nla_put_failure; -if (event ==NFT_MSG_DELTABLE ) { -nlmsg_end (skb, nlh); -return 0 ; - } -if (nla_put_be32 (skb,NFTA_TABLE_FLAGS ,htonl (table->flags &NFT_TABLE_F_MASK ))) goto nla_put_failure;
@@ -2028,11 +2023,6 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net, NFTA_CHAIN_PAD)) goto nla_put_failure; -if (event ==NFT_MSG_DELCHAIN && !hook_list) { -nlmsg_end (skb, nlh); -return 0 ; - } -if (nft_is_base_chain (chain)) {const struct nft_base_chain *basechain =nft_base_chain (chain);struct nft_stats __percpu *stats;
@@ -4859,11 +4849,6 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx, NFTA_SET_PAD)) goto nla_put_failure; -if (event ==NFT_MSG_DELSET ) { -nlmsg_end (skb, nlh); -return 0 ; - } -if (set->flags !=0 )if (nla_put_be32 (skb,NFTA_SET_FLAGS ,htonl (set->flags))) goto nla_put_failure;
@@ -8350,11 +8335,6 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net, NFTA_OBJ_PAD)) goto nla_put_failure; -if (event ==NFT_MSG_DELOBJ ) { -nlmsg_end (skb, nlh); -return 0 ; - } -if (nla_put_be32 (skb,NFTA_OBJ_TYPE ,htonl (obj->ops->type->type)) ||nla_put_be32 (skb,NFTA_OBJ_USE ,htonl (obj->use)) ||nft_object_dump (skb,NFTA_OBJ_DATA , obj, reset))
@@ -9394,11 +9374,6 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net, NFTA_FLOWTABLE_PAD)) goto nla_put_failure; -if (event ==NFT_MSG_DELFLOWTABLE && !hook_list) { -nlmsg_end (skb, nlh); -return 0 ; - } -if (nla_put_be32 (skb,NFTA_FLOWTABLE_USE ,htonl (flowtable->use)) ||nla_put_be32 (skb,NFTA_FLOWTABLE_FLAGS ,htonl (flowtable->data.flags))) goto nla_put_failure;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/4 netfilter: nf_tables: Reintroduce shortened deletion notifications
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
Restore commit 28339b21a365 ("netfilter: nf_tables: do not send complete notification of deletions") and fix it:
- Avoid upfront modification of 'event' variable so the conditionals become effective.
- Always include NFTA_OBJ_TYPE attribute in object notifications, user space requires it for proper deserialisation.
- Catch DESTROY events, too.
--- net/netfilter/nf_tables_api.c | 67 ++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 17 deletions(-)
net/netfilter/nf_tables_api.c +50 -17
@@ -1153,9 +1153,9 @@ static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net, {struct nlmsghdr *nlh; - event =nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event); - nlh =nfnl_msg_put (skb, portid, seq, event, flags, family, -NFNETLINK_V0 ,nft_base_seq (net)); + nlh =nfnl_msg_put (skb, portid, seq, +nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event), + flags, family,NFNETLINK_V0 ,nft_base_seq (net));if (!nlh) goto nla_put_failure;
@@ -1165,6 +1165,12 @@ static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net, NFTA_TABLE_PAD)) goto nla_put_failure; +if (event ==NFT_MSG_DELTABLE || + event ==NFT_MSG_DESTROYTABLE ) { +nlmsg_end (skb, nlh); +return 0 ; + } +if (nla_put_be32 (skb,NFTA_TABLE_FLAGS ,htonl (table->flags &NFT_TABLE_F_MASK ))) goto nla_put_failure;
@@ -2011,9 +2017,9 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net, {struct nlmsghdr *nlh; - event =nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event); - nlh =nfnl_msg_put (skb, portid, seq, event, flags, family, -NFNETLINK_V0 ,nft_base_seq (net)); + nlh =nfnl_msg_put (skb, portid, seq, +nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event), + flags, family,NFNETLINK_V0 ,nft_base_seq (net));if (!nlh) goto nla_put_failure;
@@ -2023,6 +2029,13 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net, NFTA_CHAIN_PAD)) goto nla_put_failure; +if (!hook_list && + (event ==NFT_MSG_DELCHAIN || + event ==NFT_MSG_DESTROYCHAIN )) { +nlmsg_end (skb, nlh); +return 0 ; + } +if (nft_is_base_chain (chain)) {const struct nft_base_chain *basechain =nft_base_chain (chain);struct nft_stats __percpu *stats;
@@ -4835,9 +4848,10 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx,u32 seq = ctx->seq;int i; - event =nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event); - nlh =nfnl_msg_put (skb, portid, seq, event, flags, ctx->family, -NFNETLINK_V0 ,nft_base_seq (ctx->net)); + nlh =nfnl_msg_put (skb, portid, seq, +nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event), + flags, ctx->family,NFNETLINK_V0 , +nft_base_seq (ctx->net));if (!nlh) goto nla_put_failure;
@@ -4849,6 +4863,12 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx, NFTA_SET_PAD)) goto nla_put_failure; +if (event ==NFT_MSG_DELSET || + event ==NFT_MSG_DESTROYSET ) { +nlmsg_end (skb, nlh); +return 0 ; + } +if (set->flags !=0 )if (nla_put_be32 (skb,NFTA_SET_FLAGS ,htonl (set->flags))) goto nla_put_failure;
@@ -8323,20 +8343,26 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net, {struct nlmsghdr *nlh; - event =nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event); - nlh =nfnl_msg_put (skb, portid, seq, event, flags, family, -NFNETLINK_V0 ,nft_base_seq (net)); + nlh =nfnl_msg_put (skb, portid, seq, +nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event), + flags, family,NFNETLINK_V0 ,nft_base_seq (net));if (!nlh) goto nla_put_failure;if (nla_put_string (skb,NFTA_OBJ_TABLE , table->name) ||nla_put_string (skb,NFTA_OBJ_NAME , obj->key.name) || +nla_put_be32 (skb,NFTA_OBJ_TYPE ,htonl (obj->ops->type->type)) ||nla_put_be64 (skb,NFTA_OBJ_HANDLE ,cpu_to_be64 (obj->handle),NFTA_OBJ_PAD )) goto nla_put_failure; -if (nla_put_be32 (skb,NFTA_OBJ_TYPE ,htonl (obj->ops->type->type)) || -nla_put_be32 (skb,NFTA_OBJ_USE ,htonl (obj->use)) || +if (event ==NFT_MSG_DELOBJ || + event ==NFT_MSG_DESTROYOBJ ) { +nlmsg_end (skb, nlh); +return 0 ; + } + +if (nla_put_be32 (skb,NFTA_OBJ_USE ,htonl (obj->use)) ||nft_object_dump (skb,NFTA_OBJ_DATA , obj, reset)) goto nla_put_failure;
@@ -9362,9 +9388,9 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,struct nft_hook *hook;struct nlmsghdr *nlh; - event =nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event); - nlh =nfnl_msg_put (skb, portid, seq, event, flags, family, -NFNETLINK_V0 ,nft_base_seq (net)); + nlh =nfnl_msg_put (skb, portid, seq, +nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event), + flags, family,NFNETLINK_V0 ,nft_base_seq (net));if (!nlh) goto nla_put_failure;
@@ -9374,6 +9400,13 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net, NFTA_FLOWTABLE_PAD)) goto nla_put_failure; +if (!hook_list && + (event ==NFT_MSG_DELFLOWTABLE || + event ==NFT_MSG_DESTROYFLOWTABLE )) { +nlmsg_end (skb, nlh); +return 0 ; + } +if (nla_put_be32 (skb,NFTA_FLOWTABLE_USE ,htonl (flowtable->use)) ||nla_put_be32 (skb,NFTA_FLOWTABLE_FLAGS ,htonl (flowtable->data.flags))) goto nla_put_failure;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/4 netfilter: nf_tables: adjust lockdep assertions handling
In reply to Pablo Neira AyusoFrom: Fedor Pchelkin <[email protected]>
It's needed to check the return value of lockdep_commit_lock_is_held(), otherwise there's no point in this assertion as it doesn't print any debug information on itself.
Found by Linux Verification Center (linuxtesting.org) with Svace static analysis tool.
--- net/netfilter/nf_tables_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +2 -2
@@ -4042,7 +4042,7 @@ void nf_tables_rule_destroy(const struct nft_ctx *ctx, struct nft_rule *rule)/* can only be used if rule is no longer visible to dumps */ static void nf_tables_rule_release (const struct nft_ctx *ctx,struct nft_rule *rule) { -lockdep_commit_lock_is_held (ctx->net); +WARN_ON_ONCE (!lockdep_commit_lock_is_held (ctx->net));nft_rule_expr_deactivate (ctx, rule,NFT_TRANS_RELEASE );nf_tables_rule_destroy (ctx, rule);
@@ -5864,7 +5864,7 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,struct nft_set_binding *binding, enum nft_trans_phase phase) { - lockdep_commit_lock_is_held(ctx->net); + WARN_ON_ONCE(!lockdep_commit_lock_is_held(ctx->net));switch (phase) {case NFT_TRANS_PREPARE_ERROR :
Signature · 1 line
2.30.2
This pull request was applied to netdev/net-next.git (main) by Pablo Neira Ayuso <[email protected]>:
Hello:
This pull request was applied to netdev/net-next.git (main) by Pablo Neira Ayuso <[email protected]>:
Quoted 10 lines · On Thu, 10 Jul 2025 03:07:02 +0200 you wrote:
v2: missing Signed-off-by: tags in patch 2/4 and 3/4.
-o-
Hi,
The following series contains an initial small batch of Netfilter updates for net-next:
[...]
Here is the summary with links:
- Netfilter updates for net-next (v2)
(no matching commit)
- [net-next,2/4] netfilter: nf_tables: Drop dead code from fill_*_info routines
https://git.kernel.org/netdev/net-next/c/8080357a8c6c - [net-next,3/4] netfilter: nf_tables: Reintroduce shortened deletion notifications https://git.kernel.org/netdev/net-next/c/a1050dd07168 - [net-next,4/4] netfilter: nf_tables: adjust lockdep assertions handling https://git.kernel.org/netdev/net-next/c/8df1b40de769
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html