[PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes

[PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes

[Florian Westphal]

Only stored, never read.  This is a leftover from commit 7d08487777c8
("netfilter: connlimit: use rbtree for per-host conntrack obj storage"),
which added the rbtree node struct that stores the address instead.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 net/netfilter/xt_connlimit.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index ffa8eec980e9..ce2870428631 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -46,7 +46,6 @@
 struct xt_connlimit_conn {
 	struct hlist_node		node;
 	struct nf_conntrack_tuple	tuple;
-	union nf_inet_addr		addr;
 };
 
 struct xt_connlimit_rb {
@@ -125,7 +124,6 @@ static bool add_hlist(struct hlist_head *head,
 	if (conn == NULL)
 		return false;
 	conn->tuple = *tuple;
-	conn->addr = *addr;
 	hlist_add_head(&conn->node, head);
 	return true;
 }
@@ -270,7 +268,6 @@ count_tree(struct net *net, struct rb_root *root,
 	}
 
 	conn->tuple = *tuple;
-	conn->addr = *addr;
 	rbconn->addr = *addr;
 
 	INIT_HLIST_HEAD(&rbconn->hhead);
-- 
2.13.6

Re: [PATCH nf-next] netfilter: xt_connlimit: don't store address in the conn nodes

[Pablo Neira Ayuso]

On Sun, Oct 15, 2017 at 11:00:34AM +0200, Florian Westphal wrote:
> Only stored, never read.  This is a leftover from commit 7d08487777c8
> ("netfilter: connlimit: use rbtree for per-host conntrack obj storage"),
> which added the rbtree node struct that stores the address instead.

Applied, thanks.