Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 471b1417 authored by Yunjian Wang's avatar Yunjian Wang Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_conncount: fix wrong variable type 



[ Upstream commit 0b88d1654d556264bcd24a9cb6383f0888e30131 ]

Now there is a issue is that code checks reports a warning: implicit
narrowing conversion from type 'unsigned int' to small type 'u8' (the
'keylen' variable). Fix it by removing the 'keylen' variable.

Signed-off-by: default avatarYunjian Wang <wangyunjian@huawei.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 406fb2bc

net/netfilter/nf_conncount.c

+3 −5
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ insert_tree(struct net *net, 
	struct nf_conncount_rb *rbconn;

	struct nf_conncount_tuple *conn;

	unsigned int count = 0, gc_count = 0;

	u8 keylen = data->keylen;

	bool do_gc = true;



	spin_lock_bh(&nf_conncount_locks[hash]);
@@ -321,7 +320,7 @@ insert_tree(struct net *net, 
		rbconn = rb_entry(*rbnode, struct nf_conncount_rb, node);



		parent = *rbnode;

		diff = key_diff(key, rbconn->key, keylen);

		diff = key_diff(key, rbconn->key, data->keylen);

		if (diff < 0) {

			rbnode = &((*rbnode)->rb_left);

		} else if (diff > 0) {
@@ -366,7 +365,7 @@ insert_tree(struct net *net, 


	conn->tuple = *tuple;

	conn->zone = *zone;

	memcpy(rbconn->key, key, sizeof(u32) * keylen);

	memcpy(rbconn->key, key, sizeof(u32) * data->keylen);



	nf_conncount_list_init(&rbconn->list);

	list_add(&conn->node, &rbconn->list.head);
@@ -391,7 +390,6 @@ count_tree(struct net *net, 
	struct rb_node *parent;

	struct nf_conncount_rb *rbconn;

	unsigned int hash;

	u8 keylen = data->keylen;



	hash = jhash2(key, data->keylen, conncount_rnd) % CONNCOUNT_SLOTS;

	root = &data->root[hash];
@@ -402,7 +400,7 @@ count_tree(struct net *net, 


		rbconn = rb_entry(parent, struct nf_conncount_rb, node);



		diff = key_diff(key, rbconn->key, keylen);

		diff = key_diff(key, rbconn->key, data->keylen);

		if (diff < 0) {

			parent = rcu_dereference_raw(parent->rb_left);

		} else if (diff > 0) {