Commit 5e614e21 authored Jan 02, 2019 by Florian Westphal Committed by Greg Kroah-Hartman Jan 09, 2019

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



commit ce49480d upstream.

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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

[mfo: backport: refresh context lines and use older symbol/file names:
 - nf_conncount.c -> xt_connlimit.c.
   - nf_conncount_rb -> xt_connlimit_rb
   - nf_conncount_tuple -> xt_connlimit_conn
  - additionally, remove the add_hlist() 'addr' parameter that isn't used and removed
    later upstream with commit 625c5561 ("netfilter: connlimit: split xt_connlimit
    into front and backend") in the rename from 'xt_connlimit.c' to 'nf_conncount.c',
    a big refactor, so do it here, while still here in this related patch.]
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 20373d98

net/netfilter/xt_connlimit.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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 {
		@@ -116,8 +115,7 @@ same_source_net(const union nf_inet_addr *addr,
		}

		static bool add_hlist(struct hlist_head *head,
		const struct nf_conntrack_tuple *tuple,
		const union nf_inet_addr *addr)
		const struct nf_conntrack_tuple *tuple)
		{
		struct xt_connlimit_conn *conn;

		@@ -125,7 +123,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;
		}
		@@ -231,7 +228,7 @@ count_tree(struct net net, struct rb_root root,
		if (!addit)
		return count;

		if (!add_hlist(&rbconn->hhead, tuple, addr))
		if (!add_hlist(&rbconn->hhead, tuple))
		return 0; /* hotdrop */

		return count + 1;
		@@ -270,7 +267,6 @@ count_tree(struct net net, struct rb_root root,
		}

		conn->tuple = *tuple;
		conn->addr = *addr;
		rbconn->addr = *addr;

		INIT_HLIST_HEAD(&rbconn->hhead);