Patch "netfilter: nat: avoid use of nf_conn_nat extension" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
netfilter: nat: avoid use of nf_conn_nat extension
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-nat-avoid-use-of-nf_conn_nat-extension.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6e699867f84c0f358fed233fe6162173aca28e04Mon Sep 17 00:00:00 2001
From: Florian Westphal <[email protected]>
Date: Tue, 28 Mar 2017 10:31:03 +0200
Subject: netfilter: nat: avoid use of nf_conn_nat extension
From: Florian Westphal <[email protected]>
commit 6e699867f84c0f358fed233fe6162173aca28e04 upstream.
successful insert into the bysource hash sets IPS_SRC_NAT_DONE status bit so we can check that instead of presence of nat extension which requires extra deref.
--- net/netfilter/nf_conntrack_core.c | 2 +- net/netfilter/nf_nat_core.c | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-)
net/netfilter/nf_conntrack_core.c +1 -1
@@ -689,7 +689,7 @@ static int nf_ct_resolve_clash(struct ne l4proto =__nf_ct_l4proto_find (nf_ct_l3num (ct),nf_ct_protonum (ct));if (l4proto->allow_clash && - !nfct_nat (ct) && + ((ct->status &IPS_NAT_DONE_MASK ) ==0 ) && !nf_ct_is_dying (ct) &&atomic_inc_not_zero (&ct->ct_general.use)) {nf_ct_acct_merge (ct, ctinfo, (struct nf_conn *)skb->nfct);
net/netfilter/nf_nat_core.c +4 -14
@@ -550,10 +550,6 @@ struct nf_nat_proto_clean {static int nf_nat_proto_remove (struct nf_conn *i,void *data) {const struct nf_nat_proto_clean *clean = data; -struct nf_conn_nat *nat =nfct_nat (i); - -if (!nat) -return 0 ;if ((clean->l3proto &&nf_ct_l3num (i) != clean->l3proto) || (clean->l4proto &&nf_ct_protonum (i) != clean->l4proto))
@@ -564,12 +560,10 @@ static int nf_nat_proto_remove(struct nfstatic int nf_nat_proto_clean (struct nf_conn *ct,void *data) { -struct nf_conn_nat *nat =nfct_nat (ct); -if (nf_nat_proto_remove (ct, data))return 1 ; -if (!nat) +if ((ct->status &IPS_SRC_NAT_DONE ) ==0 )return 0 ;/* This netns is being destroyed, and conntrack has nat null binding.
@@ -705,13 +699,9 @@ EXPORT_SYMBOL_GPL(nf_nat_l3proto_unregis/* No one using conntrack by the time this called. */ static void nf_nat_cleanup_conntrack (struct nf_conn *ct) { -struct nf_conn_nat *nat =nf_ct_ext_find (ct,NF_CT_EXT_NAT ); - -if (!nat) -return ; - -rhltable_remove (&nf_nat_bysource_table, &ct->nat_bysource, - nf_nat_bysource_params); +if (ct->status &IPS_SRC_NAT_DONE ) +rhltable_remove (&nf_nat_bysource_table, &ct->nat_bysource, + nf_nat_bysource_params); }static struct nf_ct_ext_type nat_extend__read_mostly = {
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/netfilter-nat-revert-netfilter-nat-convert-nat-bysrc-hash-to-rhashtable.patch queue-4.9/netfilter-nat-avoid-use-of-nf_conn_nat-extension.patch