lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nf_conncount: fix wrong variable type

Browse Source 
[ 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: Yunjian Wang <wangyunjian@huawei.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yunjian Wang 2024-05-31 11:48:47 +08:00 committed by Greg Kroah-Hartman
parent 37c60b3ff4
commit 52d2172873
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/netfilter/nf_conncount.c
View File

@ -310,7 +310,6 @@ insert_tree(struct net *net,
struct nf_conncount_rb *rbconn; struct nf_conncount_rb *rbconn;
struct nf_conncount_tuple *conn; struct nf_conncount_tuple *conn;
unsigned int count = 0, gc_count = 0; unsigned int count = 0, gc_count = 0;
u8 keylen = data->keylen;
bool do_gc = true; bool do_gc = true;
spin_lock_bh(&nf_conncount_locks[hash]); spin_lock_bh(&nf_conncount_locks[hash]);
@ -322,7 +321,7 @@ restart:
rbconn = rb_entry(*rbnode, struct nf_conncount_rb, node); rbconn = rb_entry(*rbnode, struct nf_conncount_rb, node);
parent = *rbnode; parent = *rbnode;
diff = key_diff(key, rbconn->key, keylen); diff = key_diff(key, rbconn->key, data->keylen);
if (diff < 0) { if (diff < 0) {
rbnode = &((*rbnode)->rb_left); rbnode = &((*rbnode)->rb_left);
} else if (diff > 0) { } else if (diff > 0) {
@ -367,7 +366,7 @@ restart:
conn->tuple = *tuple; conn->tuple = *tuple;
conn->zone = *zone; conn->zone = *zone;
memcpy(rbconn->key, key, sizeof(u32) * keylen); memcpy(rbconn->key, key, sizeof(u32) * data->keylen);
nf_conncount_list_init(&rbconn->list); nf_conncount_list_init(&rbconn->list);
list_add(&conn->node, &rbconn->list.head); list_add(&conn->node, &rbconn->list.head);
@ -392,7 +391,6 @@ count_tree(struct net *net,
struct rb_node *parent; struct rb_node *parent;
struct nf_conncount_rb *rbconn; struct nf_conncount_rb *rbconn;
unsigned int hash; unsigned int hash;
u8 keylen = data->keylen;
hash = jhash2(key, data->keylen, conncount_rnd) % CONNCOUNT_SLOTS; hash = jhash2(key, data->keylen, conncount_rnd) % CONNCOUNT_SLOTS;
root = &data->root[hash]; root = &data->root[hash];
@ -403,7 +401,7 @@ count_tree(struct net *net,
rbconn = rb_entry(parent, struct nf_conncount_rb, node); 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) { if (diff < 0) {
parent = rcu_dereference_raw(parent->rb_left); parent = rcu_dereference_raw(parent->rb_left);
} else if (diff > 0) { } else if (diff > 0) {