[SRU X][PATCH 1/6] netfilter: xt_connlimit: don't store address in the conn nodes
Mauricio Faria de Oliveira
mfo at canonical.com
Thu Jan 10 03:31:59 UTC 2019
From: Florian Westphal <fw at strlen.de>
BugLink: https://bugs.launchpad.net/bugs/1811094
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 at strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
(cherry picked from commit ce49480dba8666cba0106e8e31a942c9ce4c438a)
Signed-off-by: Mauricio Faria de Oliveira <mfo at canonical.com>
---
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 99bbc829868d..1152a4bb7b9b 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 {
@@ -126,7 +125,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;
}
@@ -274,7 +272,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.17.1
More information about the kernel-team
mailing list