[PATCH net] netfilter: nf_conncount: fix wrong variable type

[PATCH net] netfilter: nf_conncount: fix wrong variable type

[Yunjian Wang]

'keylen' is supposed to be unsigned int, not u8, so fix it.

Fixes: 2ba39118c10a ("netfilter: nf_conncount: Move locking into count_tree()")
Fixes: c80f10bc973a ("netfilter: nf_conncount: speculative garbage collection on empty lists")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 net/netfilter/nf_conncount.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conncount.c b/net/netfilter/nf_conncount.c
index 8715617b02fe..4554f4b093fa 100644
--- a/net/netfilter/nf_conncount.c
+++ b/net/netfilter/nf_conncount.c
@@ -321,7 +321,7 @@ 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;
+	unsigned int keylen = data->keylen;
 	bool do_gc = true;
 
 	spin_lock_bh(&nf_conncount_locks[hash]);
@@ -403,7 +403,7 @@ count_tree(struct net *net,
 	struct rb_node *parent;
 	struct nf_conncount_rb *rbconn;
 	unsigned int hash;
-	u8 keylen = data->keylen;
+	unsigned int keylen = data->keylen;
 
 	hash = jhash2(key, data->keylen, conncount_rnd) % CONNCOUNT_SLOTS;
 	root = &data->root[hash];
-- 
2.33.0

Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type

[Florian Westphal]

Yunjian Wang <wangyunjian@huawei.com> wrote:
> 'keylen' is supposed to be unsigned int, not u8, so fix it.

Its limited to 5, so u8 works fine.

RE: [PATCH net] netfilter: nf_conncount: fix wrong variable type

[wangyunjian]

> -----Original Message-----
> From: Florian Westphal [mailto:fw@strlen.de]
> Sent: Wednesday, May 29, 2024 8:03 PM
> To: wangyunjian <wangyunjian@huawei.com>
> Cc: netfilter-devel@vger.kernel.org; pablo@netfilter.org; kadlec@netfilter.org;
> kuba@kernel.org; davem@davemloft.net; coreteam@netfilter.org; xudingke
> <xudingke@huawei.com>
> Subject: Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type
> 
> Yunjian Wang <wangyunjian@huawei.com> wrote:
> > 'keylen' is supposed to be unsigned int, not u8, so fix it.
> 
> Its limited to 5, so u8 works fine.

Currently, it does not affect the functionality. The main issue is that code
checks will report a warning: implicit narrowing conversion from type
'unsigned int' to small type 'u8'.

Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type

[Florian Westphal]

wangyunjian <wangyunjian@huawei.com> wrote:
> > -----Original Message-----
> > From: Florian Westphal [mailto:fw@strlen.de]
> > Sent: Wednesday, May 29, 2024 8:03 PM
> > To: wangyunjian <wangyunjian@huawei.com>
> > Cc: netfilter-devel@vger.kernel.org; pablo@netfilter.org; kadlec@netfilter.org;
> > kuba@kernel.org; davem@davemloft.net; coreteam@netfilter.org; xudingke
> > <xudingke@huawei.com>
> > Subject: Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type
> > 
> > Yunjian Wang <wangyunjian@huawei.com> wrote:
> > > 'keylen' is supposed to be unsigned int, not u8, so fix it.
> > 
> > Its limited to 5, so u8 works fine.
> 
> Currently, it does not affect the functionality. The main issue is that code
> checks will report a warning: implicit narrowing conversion from type
> 'unsigned int' to small type 'u8'.

Then please quote the exact warning in the commit message and remove the
u8 temporary variable in favor of data->keylen.

RE: [PATCH net] netfilter: nf_conncount: fix wrong variable type

[wangyunjian]

> -----Original Message-----
> From: Florian Westphal [mailto:fw@strlen.de]
> Sent: Thursday, May 30, 2024 3:52 PM
> To: wangyunjian <wangyunjian@huawei.com>
> Cc: Florian Westphal <fw@strlen.de>; netfilter-devel@vger.kernel.org;
> pablo@netfilter.org; kadlec@netfilter.org; kuba@kernel.org;
> davem@davemloft.net; coreteam@netfilter.org; xudingke
> <xudingke@huawei.com>
> Subject: Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type
> 
> wangyunjian <wangyunjian@huawei.com> wrote:
> > > -----Original Message-----
> > > From: Florian Westphal [mailto:fw@strlen.de]
> > > Sent: Wednesday, May 29, 2024 8:03 PM
> > > To: wangyunjian <wangyunjian@huawei.com>
> > > Cc: netfilter-devel@vger.kernel.org; pablo@netfilter.org;
> kadlec@netfilter.org;
> > > kuba@kernel.org; davem@davemloft.net; coreteam@netfilter.org;
> xudingke
> > > <xudingke@huawei.com>
> > > Subject: Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type
> > >
> > > Yunjian Wang <wangyunjian@huawei.com> wrote:
> > > > 'keylen' is supposed to be unsigned int, not u8, so fix it.
> > >
> > > Its limited to 5, so u8 works fine.
> >
> > Currently, it does not affect the functionality. The main issue is that code
> > checks will report a warning: implicit narrowing conversion from type
> > 'unsigned int' to small type 'u8'.
> 
> Then please quote the exact warning in the commit message and remove the
> u8 temporary variable in favor of data->keylen.

OK, I will update it. This is not a bugfix, only considered for net-next?

Thanks.

Re: [PATCH net] netfilter: nf_conncount: fix wrong variable type

[Florian Westphal]

wangyunjian <wangyunjian@huawei.com> wrote:
> > Then please quote the exact warning in the commit message and remove the
> > u8 temporary variable in favor of data->keylen.
> 
> OK, I will update it. This is not a bugfix, only considered for net-next?

nf-next, yes.