Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover 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(-)
Pablo Neira Ayuso
maintainerPATCH 1/12 netfilter: conntrack: remove duplicated include from nf_conntrack_proto_udp.c
From: Yue Haibing <[email protected]>
Remove duplicated include.
--- net/netfilter/nf_conntrack_proto_udp.c | 1 - 1 file changed, 1 deletion(-)
net/netfilter/nf_conntrack_proto_udp.c +0 -1
@@ -393,4 +393,3 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 = };EXPORT_SYMBOL_GPL (nf_conntrack_l4proto_udplite6);#endif -#include <net/netfilter/nf_conntrack_timeout.h>
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/12 netfilter: xt_cluster: add dependency on conntrack module
In reply to Pablo Neira AyusoFrom: Martin Willi <[email protected]>
The cluster match requires conntrack for matching packets. If the netns does not have conntrack hooks registered, the match does not work at all.
Implicitly load the conntrack hook for the family, exactly as many other extensions do. This ensures that the match works even if the hooks have not been registered by other means.
--- net/netfilter/xt_cluster.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
net/netfilter/xt_cluster.c +13 -1
@@ -125,6 +125,7 @@ xt_cluster_mt(const struct sk_buff *skb, struct xt_action_param *par)static int xt_cluster_mt_checkentry (const struct xt_mtchk_param *par) {struct xt_cluster_match_info *info = par->matchinfo; +int ret;if (info->total_nodes >XT_CLUSTER_NODES_MAX ) { pr_info_ratelimited("you have exceeded the maximum number of cluster nodes (%u > %u)\n",
@@ -135,7 +136,17 @@ static int xt_cluster_mt_checkentry(const struct xt_mtchk_param *par)pr_info_ratelimited ("node mask cannot exceed total number of nodes\n" );return -EDOM ; } -return 0 ; + + ret =nf_ct_netns_get (par->net, par->family); +if (ret <0 ) +pr_info_ratelimited ("cannot load conntrack support for proto=%u\n" , + par->family); +return ret; +} + +static void xt_cluster_mt_destroy (const struct xt_mtdtor_param *par) +{ +nf_ct_netns_put (par->net, par->family); }static struct xt_match xt_cluster_match__read_mostly = {
@@ -144,6 +155,7 @@ static struct xt_match xt_cluster_match __read_mostly = { .match = xt_cluster_mt, .checkentry = xt_cluster_mt_checkentry, .matchsize = sizeof(struct xt_cluster_match_info), + .destroy = xt_cluster_mt_destroy, .me = THIS_MODULE, };
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/12 netfilter: xt_checksum: ignore gso skbs
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Satish Patel reports a skb_warn_bad_offload() splat caused by -j CHECKSUM rules:
-A POSTROUTING -p tcp -m tcp --sport 80 -j CHECKSUM
The CHECKSUM target has never worked with GSO skbs, and the above rule makes no sense as kernel will handle checksum updates on transmit.
Unfortunately, there are 3rd party tools that install such rules, so we cannot reject this from the config plane without potential breakage.
Amend Kconfig text to clarify that the CHECKSUM target is only useful in virtualized environments, where old dhcp clients that use AF_PACKET used to discard UDP packets with a 'bad' header checksum and add a one-time warning in case such rule isn't restricted to UDP.
v2: check IP6T_F_PROTO flag before cmp (Michal Kubecek)
--- net/netfilter/Kconfig | 12 ++++++------ net/netfilter/xt_CHECKSUM.c | 22 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 7 deletions(-)
net/netfilter/Kconfig +6 -6
@@ -771,13 +771,13 @@ config NETFILTER_XT_TARGET_CHECKSUM depends on NETFILTER_ADVANCED ---help--- This option adds a `CHECKSUM' target, which can be used in the iptables mangle - table. + table to work around buggy DHCP clients in virtualized environments. - You can use this target to compute and fill in the checksum in - a packet that lacks a checksum. This is particularly useful, - if you need to work around old applications such as dhcp clients, - that do not work well with checksum offloads, but don't want to disable - checksum offload in your device. + Some old DHCP clients drop packets because they are not aware + that the checksum would normally be offloaded to hardware and + thus should be considered valid. + This target can be used to fill in the checksum using iptables + when such packets are sent via a virtual network device. To compile it as a module, choose M here. If unsure, say N.
net/netfilter/xt_CHECKSUM.c +21 -1
@@ -16,6 +16,9 @@#include <linux/netfilter/x_tables.h> #include <linux/netfilter/xt_CHECKSUM.h> +#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter_ipv6/ip6_tables.h> +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Michael S. Tsirkin <[email protected]>" );MODULE_DESCRIPTION ("Xtables: checksum modification" );
@@ -25,7 +28,7 @@ MODULE_ALIAS("ip6t_CHECKSUM");static unsigned int checksum_tg (struct sk_buff *skb,const struct xt_action_param *par) { -if (skb->ip_summed ==CHECKSUM_PARTIAL ) +if (skb->ip_summed ==CHECKSUM_PARTIAL && !skb_is_gso (skb))skb_checksum_help (skb);return XT_CONTINUE ;
@@ -34,6 +37,8 @@ checksum_tg(struct sk_buff *skb, const struct xt_action_param *par)static int checksum_tg_check (const struct xt_tgchk_param *par) {const struct xt_CHECKSUM_info *einfo = par->targinfo; +const struct ip6t_ip6 *i6 = par->entryinfo; +const struct ipt_ip *i4 = par->entryinfo;if (einfo->operation & ~XT_CHECKSUM_OP_FILL ) { pr_info_ratelimited("unsupported CHECKSUM operation %x\n",
@@ -43,6 +48,21 @@ static int checksum_tg_check(const struct xt_tgchk_param *par)if (!einfo->operation)return -EINVAL ; +switch (par->family) { +case NFPROTO_IPV4 : +if (i4->proto ==IPPROTO_UDP && + (i4->invflags &XT_INV_PROTO ) ==0 ) +return 0 ; +break ; +case NFPROTO_IPV6 : +if ((i6->flags &IP6T_F_PROTO ) && + i6->proto ==IPPROTO_UDP && + (i6->invflags &XT_INV_PROTO ) ==0 ) +return 0 ; +break ; + } + +pr_warn_once ("CHECKSUM should be avoided. If really needed, restrict with \"-p udp\" and only use in OUTPUT\n" );return 0 ; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/12 netfilter: conntrack: place 'new' timeout in first location too
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
tcp, sctp and dccp trackers re-use the userspace ctnetlink states to index their timeout arrays, which means timeout[0] is never used. Copy the 'new' state (syn-sent, dccp-request, ..) to 0 as well so external users can simply read it off timeouts[0] without need to differentiate dccp/sctp/tcp and udp/icmp/gre/generic.
The alternative is to map all array accesses to 'i - 1', but that is a much more intrusive change.
--- net/netfilter/nf_conntrack_proto_dccp.c | 7 +++++++ net/netfilter/nf_conntrack_proto_sctp.c | 7 +++++++ net/netfilter/nf_conntrack_proto_tcp.c | 7 +++++++ 3 files changed, 21 insertions(+)
net/netfilter/nf_conntrack_proto_dccp.c +7 -0
@@ -697,6 +697,8 @@ static int dccp_timeout_nlattr_to_obj(struct nlattr *tb[], timeouts[i] =ntohl (nla_get_be32 (tb[i])) *HZ ; } } + + timeouts[CTA_TIMEOUT_DCCP_UNSPEC ] = timeouts[CTA_TIMEOUT_DCCP_REQUEST ];return 0 ; }
@@ -827,6 +829,11 @@ static int dccp_init_net(struct net *net, u_int16_t proto) dn->dccp_timeout[CT_DCCP_CLOSEREQ ] =64 *HZ ; dn->dccp_timeout[CT_DCCP_CLOSING ] =64 *HZ ; dn->dccp_timeout[CT_DCCP_TIMEWAIT ] =2 *DCCP_MSL ; + +/* timeouts[0] is unused, make it same as SYN_SENT so +* ->timeouts[0] contains 'new' timeout, like udp or icmp. +*/ + dn->dccp_timeout[CT_DCCP_NONE ] = dn->dccp_timeout[CT_DCCP_REQUEST ]; }return dccp_kmemdup_sysctl_table (net, pn, dn);
net/netfilter/nf_conntrack_proto_sctp.c +7 -0
@@ -613,6 +613,8 @@ static int sctp_timeout_nlattr_to_obj(struct nlattr *tb[], timeouts[i] =ntohl (nla_get_be32 (tb[i])) *HZ ; } } + + timeouts[CTA_TIMEOUT_SCTP_UNSPEC ] = timeouts[CTA_TIMEOUT_SCTP_CLOSED ];return 0 ; }
@@ -743,6 +745,11 @@ static int sctp_init_net(struct net *net, u_int16_t proto)for (i =0 ; i <SCTP_CONNTRACK_MAX ; i++) sn->timeouts[i] = sctp_timeouts[i]; + +/* timeouts[0] is unused, init it so ->timeouts[0] contains +* 'new' timeout, like udp or icmp. +*/ + sn->timeouts[0 ] = sctp_timeouts[SCTP_CONNTRACK_CLOSED ]; }return sctp_kmemdup_sysctl_table (pn, sn);
net/netfilter/nf_conntrack_proto_tcp.c +7 -0
@@ -1301,6 +1301,7 @@ static int tcp_timeout_nlattr_to_obj(struct nlattr *tb[], timeouts[TCP_CONNTRACK_SYN_SENT ] =ntohl (nla_get_be32 (tb[CTA_TIMEOUT_TCP_SYN_SENT ]))*HZ ; } +if (tb[CTA_TIMEOUT_TCP_SYN_RECV ]) { timeouts[TCP_CONNTRACK_SYN_RECV ] =ntohl (nla_get_be32 (tb[CTA_TIMEOUT_TCP_SYN_RECV ]))*HZ ;
@@ -1341,6 +1342,8 @@ static int tcp_timeout_nlattr_to_obj(struct nlattr *tb[], timeouts[TCP_CONNTRACK_UNACK ] =ntohl (nla_get_be32 (tb[CTA_TIMEOUT_TCP_UNACK ]))*HZ ; } + + timeouts[CTA_TIMEOUT_TCP_UNSPEC ] = timeouts[CTA_TIMEOUT_TCP_SYN_SENT ];return 0 ; }
@@ -1518,6 +1521,10 @@ static int tcp_init_net(struct net *net, u_int16_t proto)for (i =0 ; i <TCP_CONNTRACK_TIMEOUT_MAX ; i++) tn->timeouts[i] = tcp_timeouts[i]; +/* timeouts[0] is unused, make it same as SYN_SENT so +* ->timeouts[0] contains 'new' timeout, like udp or icmp. +*/ + tn->timeouts[0 ] = tcp_timeouts[TCP_CONNTRACK_SYN_SENT ]; tn->tcp_loose = nf_ct_tcp_loose; tn->tcp_be_liberal = nf_ct_tcp_be_liberal; tn->tcp_max_retrans = nf_ct_tcp_max_retrans;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/12 netfilter: nf_tables: rework ct timeout set support
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Using a private template is problematic:
1. We can't assign both a zone and a timeout policy (zone assigns a conntrack template, so we hit problem 1)
2. Using a template needs to take care of ct refcount, else we'll eventually free the private template due to ->use underflow.
This patch reworks template policy to instead work with existing conntrack.
As long as such conntrack has not yet been placed into the hash table (unconfirmed) we can still add the timeout extension.
The only caveat is that we now need to update/correct ct->timeout to reflect the initial/new state, otherwise the conntrack entry retains the default 'new' timeout.
Side effect of this change is that setting the policy must now occur from chains that are evaluated *after* the conntrack lookup has taken place.
No released kernel contains the timeout policy feature yet, so this change should be ok.
Changes since v2:
- don't handle 'ct is confirmed case'
- after previous patch, no need to special-case tcp/dccp/sctp timeout anymore
--- include/net/netfilter/nf_conntrack_timeout.h | 2 +- net/netfilter/nft_ct.c | 59 ++++++++++++++-------------- 2 files changed, 30 insertions(+), 31 deletions(-)
include/net/netfilter/nf_conntrack_timeout.h +1 -1
@@ -30,7 +30,7 @@ struct nf_conn_timeout { };static inline unsigned int * -nf_ct_timeout_data (struct nf_conn_timeout *t) +nf_ct_timeout_data (const struct nf_conn_timeout *t) {struct nf_ct_timeout *timeout;
net/netfilter/nft_ct.c +29 -30
112 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/12 netfilter: kconfig: nat related expression depend on nftables core
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
NF_TABLES_IPV4 is now boolean so it is possible to set
NF_TABLES=m
NF_TABLES_IPV4=y
NFT_CHAIN_NAT_IPV4=y
which causes:
nft_chain_nat_ipv4.c:(.text+0x6d): undefined reference to `nft_do_chain'
Wrap NFT_CHAIN_NAT_IPV4 and related nat expressions with NF_TABLES to restore the dependency.
--- net/ipv4/netfilter/Kconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv4/netfilter/Kconfig +5 -3
@@ -106,6 +106,10 @@ config NF_NAT_IPV4 if NF_NAT_IPV4 +config NF_NAT_MASQUERADE_IPV4 + bool + +if NF_TABLES config NFT_CHAIN_NAT_IPV4 depends on NF_TABLES_IPV4 tristate "IPv4 nf_tables nat chain support"
@@ -115,9 +119,6 @@ config NFT_CHAIN_NAT_IPV4 packet transformations such as the source, destination address and source and destination ports. -config NF_NAT_MASQUERADE_IPV4 - bool - config NFT_MASQ_IPV4 tristate "IPv4 masquerading support for nf_tables" depends on NF_TABLES_IPV4
@@ -135,6 +136,7 @@ config NFT_REDIR_IPV4 help This is the expression that provides IPv4 redirect support for nf_tables. +endif # NF_TABLES config NF_NAT_SNMP_BASIC tristate "Basic SNMP-ALG support"
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/12 netfilter: nf_tables: release chain in flushing set
In reply to Pablo Neira AyusoFrom: Taehee Yoo <[email protected]>
When element of verdict map is deleted, the delete routine should release chain. however, flush element of verdict map routine doesn't release chain.
test commands:
%nft add table ip filter
%nft add chain ip filter c1
%nft add map ip filter map1 { type ipv4_addr : verdict \; } %nft add element ip filter map1 { 1 : jump c1 } %nft flush map ip filter map1
%nft flush ruleset
splat looks like:
[ 4895.170899] kernel BUG at net/netfilter/nf_tables_api.c:1415! [ 4895.178114] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 4895.178880] CPU: 0 PID: 1670 Comm: nft Not tainted 4.18.0+ #55 [ 4895.178880] RIP: 0010:nf_tables_chain_destroy.isra.28+0x39/0x220 [nf_tables] [ 4895.178880] Code: fc ff df 53 48 89 fb 48 83 c7 50 48 89 fa 48 c1 ea 03 0f b6 04 02 84 c0 74 09 3c 03 7f 05 e8 3e 4c 25 e1 8b 43 50 85 c0 74 02 <0f> 0b 48 89 da 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 80 3c 02 [ 4895.228342] RSP: 0018:ffff88010b98f4c0 EFLAGS: 00010202 [ 4895.234841] RAX: 0000000000000001 RBX: ffff8801131c6968 RCX: ffff8801146585b0 [ 4895.234841] RDX: 1ffff10022638d37 RSI: ffff8801191a9348 RDI: ffff8801131c69b8 [ 4895.234841] RBP: ffff8801146585a8 R08: 1ffff1002323526a R09: 0000000000000000 [ 4895.234841] R10: 0000000000000000 R11: 0000000000000000 R12: dead000000000200 [ 4895.234841] R13: dead000000000100 R14: ffffffffa3638af8 R15: dffffc0000000000 [ 4895.234841] FS: 00007f6d188e6700(0000) GS:ffff88011b600000(0000) knlGS:0000000000000000 [ 4895.234841] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 4895.234841] CR2: 00007ffe72b8df88 CR3: 000000010e2d4000 CR4: 00000000001006f0 [ 4895.234841] Call Trace: [ 4895.234841] nf_tables_commit+0x2704/0x2c70 [nf_tables] [ 4895.234841] ? nfnetlink_rcv_batch+0xa4f/0x11b0 [nfnetlink] [ 4895.234841] ? nf_tables_setelem_notify.constprop.48+0x1a0/0x1a0 [nf_tables] [ 4895.323824] ? __lock_is_held+0x9d/0x130 [ 4895.323824] ? kasan_unpoison_shadow+0x30/0x40 [ 4895.333299] ? kasan_kmalloc+0xa9/0xc0 [ 4895.333299] ? kmem_cache_alloc_trace+0x2c0/0x310 [ 4895.333299] ? nfnetlink_rcv_batch+0xa4f/0x11b0 [nfnetlink] [ 4895.333299] nfnetlink_rcv_batch+0xdb9/0x11b0 [nfnetlink] [ 4895.333299] ? debug_show_all_locks+0x290/0x290 [ 4895.333299] ? nfnetlink_net_init+0x150/0x150 [nfnetlink] [ 4895.333299] ? sched_clock_cpu+0xe5/0x170 [ 4895.333299] ? sched_clock_local+0xff/0x130 [ 4895.333299] ? sched_clock_cpu+0xe5/0x170 [ 4895.333299] ? find_held_lock+0x39/0x1b0 [ 4895.333299] ? sched_clock_local+0xff/0x130 [ 4895.333299] ? memset+0x1f/0x40 [ 4895.333299] ? nla_parse+0x33/0x260 [ 4895.333299] ? ns_capable_common+0x6e/0x110 [ 4895.333299] nfnetlink_rcv+0x2c0/0x310 [nfnetlink]
[ ... ]
--- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_tables_api.c +1 -0
@@ -4637,6 +4637,7 @@ static int nft_flush_set(const struct nft_ctx *ctx, } set->ndeact++; +nft_set_elem_deactivate (ctx->net, set, elem);nft_trans_elem_set (trans) = set;nft_trans_elem (trans) = *elem;list_add_tail (&trans->list, &ctx->net->nft.commit_list);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/12 netfilter: conntrack: reset tcp maxwin on re-register
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Doug Smythies says:
Sometimes it is desirable to temporarily disable, or clear, the iptables rule set on a computer being controlled via a secure shell session (SSH). While unwise on an internet facing computer, I also do it often on non-internet accessible computers while testing. Recently, this has become problematic, with the SSH session being dropped upon re-load of the rule set.
The problem is that when all rules are deleted, conntrack hooks get unregistered.
In case the rules are re-added later, its possible that tcp window has moved far enough so that all packets are considered invalid (out of window) until entry expires (which can take forever, default established timeout is 5 days).
Fix this by clearing maxwin of existing tcp connections on register.
v2: don't touch entries on hook removal.
v3: remove obsolete expiry check.
--- net/netfilter/nf_conntrack_proto.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
net/netfilter/nf_conntrack_proto.c +26 -0
@@ -776,9 +776,26 @@ static const struct nf_hook_ops ipv6_conntrack_ops[] = { };#endif +static int nf_ct_tcp_fixup (struct nf_conn *ct,void *_nfproto) +{ +u8 nfproto = (unsigned long )_nfproto; + +if (nf_ct_l3num (ct) != nfproto) +return 0 ; + +if (nf_ct_protonum (ct) ==IPPROTO_TCP && + ct->proto.tcp.state ==TCP_CONNTRACK_ESTABLISHED ) { + ct->proto.tcp.seen[0 ].td_maxwin =0 ; + ct->proto.tcp.seen[1 ].td_maxwin =0 ; + } + +return 0 ; +} +static int nf_ct_netns_do_get (struct net *net,u8 nfproto) {struct nf_conntrack_net *cnet =net_generic (net, nf_conntrack_net_id); +bool fixup_needed = false;int err =0 ;mutex_lock (&nf_ct_proto_mutex);
@@ -798,6 +815,8 @@ static int nf_ct_netns_do_get(struct net *net, u8 nfproto) ARRAY_SIZE(ipv4_conntrack_ops));if (err) cnet->users4 =0 ; +else + fixup_needed = true;break ;#if IS_ENABLED (CONFIG_IPV6 )case NFPROTO_IPV6 :
@@ -814,6 +833,8 @@ static int nf_ct_netns_do_get(struct net *net, u8 nfproto) ARRAY_SIZE(ipv6_conntrack_ops));if (err) cnet->users6 =0 ; +else + fixup_needed = true;break ;#endif default :
@@ -822,6 +843,11 @@ static int nf_ct_netns_do_get(struct net *net, u8 nfproto) } out_unlock:mutex_unlock (&nf_ct_proto_mutex); + +if (fixup_needed) +nf_ct_iterate_cleanup_net (net, nf_ct_tcp_fixup, + (void *)(unsigned long )nfproto,0 ,0 ); +return err; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/12 netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUT
In reply to Pablo Neira AyusoNow that cttimeout support for nft_ct is in place, these should depend on CONFIG_NF_CONNTRACK_TIMEOUT otherwise we can crash when dumping the policy if this option is not enabled.
[ 71.600121] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [...] [ 71.600141] CPU: 3 PID: 7612 Comm: nft Not tainted 4.18.0+ #246 [...] [ 71.600188] Call Trace: [ 71.600201] ? nft_ct_timeout_obj_dump+0xc6/0xf0 [nft_ct]
--- net/netfilter/nf_conntrack_proto_dccp.c | 12 ++++++------ 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 | 14 +++++++------- net/netfilter/nf_conntrack_proto_tcp.c | 12 ++++++------ net/netfilter/nf_conntrack_proto_udp.c | 20 ++++++++++---------- 8 files changed, 45 insertions(+), 45 deletions(-)
net/netfilter/nf_conntrack_proto_dccp.c +6 -6
@@ -675,7 +675,7 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct) }#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -728,7 +728,7 @@ dccp_timeout_nla_policy[CTA_TIMEOUT_DCCP_MAX+1] = { [CTA_TIMEOUT_DCCP_CLOSING] = { .type = NLA_U32 }, [CTA_TIMEOUT_DCCP_TIMEWAIT] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL /* template, data assigned later */
@@ -863,7 +863,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 = { .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = dccp_timeout_nlattr_to_obj, .obj_to_nlattr = dccp_timeout_obj_to_nlattr,
@@ -871,7 +871,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 = { .obj_size = sizeof(unsigned int) * CT_DCCP_MAX, .nla_policy = dccp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = dccp_init_net, .get_net_proto = dccp_get_net_proto, };
@@ -896,7 +896,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 = { .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = dccp_timeout_nlattr_to_obj, .obj_to_nlattr = dccp_timeout_obj_to_nlattr,
@@ -904,7 +904,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 = { .obj_size = sizeof(unsigned int) * CT_DCCP_MAX, .nla_policy = dccp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = dccp_init_net, .get_net_proto = dccp_get_net_proto, };
net/netfilter/nf_conntrack_proto_generic.c +4 -4
@@ -70,7 +70,7 @@ static bool generic_new(struct nf_conn *ct, const struct sk_buff *skb,return ret; } -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -113,7 +113,7 @@ static const struct nla_policy generic_timeout_nla_policy[CTA_TIMEOUT_GENERIC_MAX+1] = { [CTA_TIMEOUT_GENERIC_TIMEOUT] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL static struct ctl_table generic_sysctl_table[] = {
@@ -164,7 +164,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = .pkt_to_tuple = generic_pkt_to_tuple, .packet = generic_packet, .new = generic_new, -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = generic_timeout_nlattr_to_obj, .obj_to_nlattr = generic_timeout_obj_to_nlattr,
@@ -172,7 +172,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = .obj_size = sizeof(unsigned int), .nla_policy = generic_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = generic_init_net, .get_net_proto = generic_get_net_proto, };
net/netfilter/nf_conntrack_proto_gre.c +4 -4
@@ -285,7 +285,7 @@ static void gre_destroy(struct nf_conn *ct)nf_ct_gre_keymap_destroy (master); } -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -334,7 +334,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_MAX+1] = { [CTA_TIMEOUT_GRE_UNREPLIED] = { .type = NLA_U32 }, [CTA_TIMEOUT_GRE_REPLIED] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ static int gre_init_net (struct net *net,u_int16_t proto) {
@@ -367,7 +367,7 @@ static const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = { .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = gre_timeout_nlattr_to_obj, .obj_to_nlattr = gre_timeout_obj_to_nlattr,
@@ -375,7 +375,7 @@ static const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = { .obj_size = sizeof(unsigned int) * GRE_CT_MAX, .nla_policy = gre_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .net_id = &proto_gre_net_id, .init_net = gre_init_net, };
net/netfilter/nf_conntrack_proto_icmp.c +4 -4
@@ -273,7 +273,7 @@ static unsigned int icmp_nlattr_tuple_size(void) }#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -313,7 +313,7 @@ static const struct nla_policy icmp_timeout_nla_policy[CTA_TIMEOUT_ICMP_MAX+1] = { [CTA_TIMEOUT_ICMP_TIMEOUT] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL static struct ctl_table icmp_sysctl_table[] = {
@@ -374,7 +374,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = .nlattr_to_tuple = icmp_nlattr_to_tuple, .nla_policy = icmp_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = icmp_timeout_nlattr_to_obj, .obj_to_nlattr = icmp_timeout_obj_to_nlattr,
@@ -382,7 +382,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = .obj_size = sizeof(unsigned int), .nla_policy = icmp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = icmp_init_net, .get_net_proto = icmp_get_net_proto, };
net/netfilter/nf_conntrack_proto_icmpv6.c +4 -4
@@ -274,7 +274,7 @@ static unsigned int icmpv6_nlattr_tuple_size(void) }#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -314,7 +314,7 @@ static const struct nla_policy icmpv6_timeout_nla_policy[CTA_TIMEOUT_ICMPV6_MAX+1] = { [CTA_TIMEOUT_ICMPV6_TIMEOUT] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL static struct ctl_table icmpv6_sysctl_table[] = {
@@ -373,7 +373,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = .nlattr_to_tuple = icmpv6_nlattr_to_tuple, .nla_policy = icmpv6_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = icmpv6_timeout_nlattr_to_obj, .obj_to_nlattr = icmpv6_timeout_obj_to_nlattr,
@@ -381,7 +381,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = .obj_size = sizeof(unsigned int), .nla_policy = icmpv6_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = icmpv6_init_net, .get_net_proto = icmpv6_get_net_proto, };
net/netfilter/nf_conntrack_proto_sctp.c +7 -7
@@ -591,7 +591,7 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct) }#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -646,7 +646,7 @@ sctp_timeout_nla_policy[CTA_TIMEOUT_SCTP_MAX+1] = { [CTA_TIMEOUT_SCTP_HEARTBEAT_SENT] = { .type = NLA_U32 }, [CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL
@@ -780,7 +780,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 = { .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = sctp_timeout_nlattr_to_obj, .obj_to_nlattr = sctp_timeout_obj_to_nlattr,
@@ -788,7 +788,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 = { .obj_size = sizeof(unsigned int) * SCTP_CONNTRACK_MAX, .nla_policy = sctp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = sctp_init_net, .get_net_proto = sctp_get_net_proto, };
@@ -813,7 +813,8 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 = { .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy, -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#endif +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = sctp_timeout_nlattr_to_obj, .obj_to_nlattr = sctp_timeout_obj_to_nlattr,
@@ -821,8 +822,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 = { .obj_size = sizeof(unsigned int) * SCTP_CONNTRACK_MAX, .nla_policy = sctp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -#endif +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = sctp_init_net, .get_net_proto = sctp_get_net_proto, };
net/netfilter/nf_conntrack_proto_tcp.c +6 -6
@@ -1279,7 +1279,7 @@ static unsigned int tcp_nlattr_tuple_size(void) }#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -1394,7 +1394,7 @@ static const struct nla_policy tcp_timeout_nla_policy[CTA_TIMEOUT_TCP_MAX+1] = { [CTA_TIMEOUT_TCP_RETRANS] = { .type = NLA_U32 }, [CTA_TIMEOUT_TCP_UNACK] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL static struct ctl_table tcp_sysctl_table[] = {
@@ -1558,7 +1558,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 = .nlattr_size = TCP_NLATTR_SIZE, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = tcp_timeout_nlattr_to_obj, .obj_to_nlattr = tcp_timeout_obj_to_nlattr,
@@ -1567,7 +1567,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 = TCP_CONNTRACK_TIMEOUT_MAX, .nla_policy = tcp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = tcp_init_net, .get_net_proto = tcp_get_net_proto, };
@@ -1593,7 +1593,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 = .nlattr_tuple_size = tcp_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = tcp_timeout_nlattr_to_obj, .obj_to_nlattr = tcp_timeout_obj_to_nlattr,
@@ -1602,7 +1602,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 = TCP_CONNTRACK_TIMEOUT_MAX, .nla_policy = tcp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = tcp_init_net, .get_net_proto = tcp_get_net_proto, };
net/netfilter/nf_conntrack_proto_udp.c +10 -10
@@ -171,7 +171,7 @@ static int udp_error(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,return NF_ACCEPT ; } -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -221,7 +221,7 @@ udp_timeout_nla_policy[CTA_TIMEOUT_UDP_MAX+1] = { [CTA_TIMEOUT_UDP_UNREPLIED] = { .type = NLA_U32 }, [CTA_TIMEOUT_UDP_REPLIED] = { .type = NLA_U32 }, }; -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ #ifdef CONFIG_SYSCTL static struct ctl_table udp_sysctl_table[] = {
@@ -292,7 +292,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 = .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = udp_timeout_nlattr_to_obj, .obj_to_nlattr = udp_timeout_obj_to_nlattr,
@@ -300,7 +300,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 = .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, .nla_policy = udp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = udp_init_net, .get_net_proto = udp_get_net_proto, };
@@ -321,7 +321,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 = .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = udp_timeout_nlattr_to_obj, .obj_to_nlattr = udp_timeout_obj_to_nlattr,
@@ -329,7 +329,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 = .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, .nla_policy = udp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = udp_init_net, .get_net_proto = udp_get_net_proto, };
@@ -350,7 +350,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 = .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = udp_timeout_nlattr_to_obj, .obj_to_nlattr = udp_timeout_obj_to_nlattr,
@@ -358,7 +358,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 = .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, .nla_policy = udp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = udp_init_net, .get_net_proto = udp_get_net_proto, };
@@ -379,7 +379,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 = .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif -#if IS_ENABLED (CONFIG_NF_CT_NETLINK_TIMEOUT ) +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = udp_timeout_nlattr_to_obj, .obj_to_nlattr = udp_timeout_obj_to_nlattr,
@@ -387,7 +387,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 = .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, .nla_policy = udp_timeout_nla_policy, }, -#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ +#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ .init_net = udp_init_net, .get_net_proto = udp_get_net_proto, };
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 10/12 netfilter: cttimeout: ctnl_timeout_find_get() returns incorrect pointer to type
In reply to Pablo Neira AyusoCompiler did not catch incorrect typing in the rcu hook assignment.
% nfct add timeout test-tcp inet tcp established 100 close 10 close_wait 10 % iptables -I OUTPUT -t raw -p tcp -j CT --timeout test-tcp
dmesg - xt_CT: Timeout policy `test-tcp' can only be used by L3 protocol number 25000
The CT target bails out with incorrect layer 3 protocol number.
--- net/netfilter/nfnetlink_cttimeout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nfnetlink_cttimeout.c +3 -3
@@ -489,8 +489,8 @@ static int cttimeout_default_get(struct net *net, struct sock *ctnl,return err; } -static struct ctnl_timeout * -ctnl_timeout_find_get (struct net *net,const char *name) +static struct nf_ct_timeout *ctnl_timeout_find_get (struct net *net, +const char *name) {struct ctnl_timeout *timeout, *matching =NULL ;
@@ -509,7 +509,7 @@ ctnl_timeout_find_get(struct net *net, const char *name)break ; } err: -return matching; +return matching ? &matching->timeout :NULL ; }static void ctnl_timeout_put (struct nf_ct_timeout *t)
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/12 netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEAT
In reply to Pablo Neira AyusoFrom: Michal 'vorner' Vaner <[email protected]>
NF_REPEAT places the packet at the beginning of the iptables chain instead of accepting or rejecting it right away. The packet however will reach the end of the chain and continue to the end of iptables eventually, so it needs the same handling as NF_ACCEPT and NF_DROP.
--- net/netfilter/nfnetlink_queue.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nfnetlink_queue.c +1 -0
@@ -233,6 +233,7 @@ static void nfqnl_reinject(struct nf_queue_entry *entry, unsigned int verdict)int err;if (verdict ==NF_ACCEPT || + verdict ==NF_REPEAT || verdict ==NF_STOP ) {rcu_read_lock (); ct_hook =rcu_dereference (nf_ct_hook);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/12 netfilter: xt_hashlimit: use s->file instead of s->private
In reply to Pablo Neira AyusoFrom: Cong Wang <[email protected]>
After switching to the new procfs API, it is supposed to retrieve the private pointer from PDE_DATA(file_inode(s->file)), s->private is no longer referred.
--- net/netfilter/xt_hashlimit.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
net/netfilter/xt_hashlimit.c +9 -9
@@ -1057,7 +1057,7 @@ static struct xt_match hashlimit_mt_reg[] __read_mostly = {static void *dl_seq_start (struct seq_file *s,loff_t *pos) __acquires(htable->lock) { -struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->file));unsigned int *bucket;spin_lock_bh (&htable->lock);
@@ -1074,7 +1074,7 @@ static void *dl_seq_start(struct seq_file *s, loff_t *pos)static void *dl_seq_next (struct seq_file *s,void *v,loff_t *pos) { -struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->file));unsigned int *bucket = v; *pos = ++(*bucket);
@@ -1088,7 +1088,7 @@ static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)static void dl_seq_stop (struct seq_file *s,void *v) __releases(htable->lock) { -struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->file));unsigned int *bucket = v;if (!IS_ERR (bucket))
@@ -1130,7 +1130,7 @@ static void dl_seq_print(struct dsthash_ent *ent, u_int8_t family,static int dl_seq_real_show_v2 (struct dsthash_ent *ent,u_int8_t family,struct seq_file *s) { -struct xt_hashlimit_htable *ht =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *ht =PDE_DATA (file_inode (s->file));spin_lock (&ent->lock);/* recalculate to show accurate numbers */
@@ -1145,7 +1145,7 @@ static int dl_seq_real_show_v2(struct dsthash_ent *ent, u_int8_t family,static int dl_seq_real_show_v1 (struct dsthash_ent *ent,u_int8_t family,struct seq_file *s) { -struct xt_hashlimit_htable *ht =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *ht =PDE_DATA (file_inode (s->file));spin_lock (&ent->lock);/* recalculate to show accurate numbers */
@@ -1160,7 +1160,7 @@ static int dl_seq_real_show_v1(struct dsthash_ent *ent, u_int8_t family,static int dl_seq_real_show (struct dsthash_ent *ent,u_int8_t family,struct seq_file *s) { -struct xt_hashlimit_htable *ht =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *ht =PDE_DATA (file_inode (s->file));spin_lock (&ent->lock);/* recalculate to show accurate numbers */
@@ -1174,7 +1174,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,static int dl_seq_show_v2 (struct seq_file *s,void *v) { -struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->file));unsigned int *bucket = (unsigned int *)v;struct dsthash_ent *ent;
@@ -1188,7 +1188,7 @@ static int dl_seq_show_v2(struct seq_file *s, void *v)static int dl_seq_show_v1 (struct seq_file *s,void *v) { -struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->file));unsigned int *bucket = v;struct dsthash_ent *ent;
@@ -1202,7 +1202,7 @@ static int dl_seq_show_v1(struct seq_file *s, void *v)static int dl_seq_show (struct seq_file *s,void *v) { -struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->private)); +struct xt_hashlimit_htable *htable =PDE_DATA (file_inode (s->file));unsigned int *bucket = v;struct dsthash_ent *ent;
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Tue, 11 Sep 2018 02:20:32 +0200
Quoted 1 line
The following patchset contains Netfilter fixes for you net tree:
...
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Looks good, pulled, thanks.