Commit 68624819 authored by Florian Westphal's avatar Florian Westphal Committed by Kleber Sacilotto de Souza

netfilter: xt_connlimit: don't store address in the conn nodes

BugLink: https://bugs.launchpad.net/bugs/1811094

Only stored, never read.  This is a leftover from commit 7d084877
("netfilter: connlimit: use rbtree for per-host conntrack obj storage"),
which added the rbtree node struct that stores the address instead.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit ce49480d)
Signed-off-by: default avatarMauricio Faria de Oliveira <mfo@canonical.com>
Acked-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 6d2501cf
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
struct xt_connlimit_conn { struct xt_connlimit_conn {
struct hlist_node node; struct hlist_node node;
struct nf_conntrack_tuple tuple; struct nf_conntrack_tuple tuple;
union nf_inet_addr addr;
}; };
struct xt_connlimit_rb { struct xt_connlimit_rb {
...@@ -126,7 +125,6 @@ static bool add_hlist(struct hlist_head *head, ...@@ -126,7 +125,6 @@ static bool add_hlist(struct hlist_head *head,
if (conn == NULL) if (conn == NULL)
return false; return false;
conn->tuple = *tuple; conn->tuple = *tuple;
conn->addr = *addr;
hlist_add_head(&conn->node, head); hlist_add_head(&conn->node, head);
return true; return true;
} }
...@@ -274,7 +272,6 @@ count_tree(struct net *net, struct rb_root *root, ...@@ -274,7 +272,6 @@ count_tree(struct net *net, struct rb_root *root,
} }
conn->tuple = *tuple; conn->tuple = *tuple;
conn->addr = *addr;
rbconn->addr = *addr; rbconn->addr = *addr;
INIT_HLIST_HEAD(&rbconn->hhead); INIT_HLIST_HEAD(&rbconn->hhead);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment