[PATCH net-next] netfilter: nf_tables: fix compile warnings

[PATCH net-next] netfilter: nf_tables: fix compile warnings

[Pablo Neira Ayuso]

Remove unused variable and fix missing initialization.

>> net/netfilter/nf_tables_api.c:8266:6: warning: variable 'i' set but not used [-Wunused-but-set-variable]
           int i;
               ^
>> net/netfilter/nf_tables_api.c:8277:4: warning: variable 'data_size' is uninitialized when used here [-Wuninitialized]
                           data_size += sizeof(*prule) + rule->dlen;
                           ^~~~~~~~~
   net/netfilter/nf_tables_api.c:8262:30: note: initialize the variable 'data_size' to silence this warning
           unsigned int size, data_size;

Fixes: 2c865a8a28a1 ("netfilter: nf_tables: add rule blob layout")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
Please, directly apply to net-next, thanks. Otherwise let me know and
I'll prepare a pull request with pending fixes once net-next gets merged
into net.

 net/netfilter/nf_tables_api.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index eb12fc9b803d..1f80a1fae63b 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8260,18 +8260,16 @@ static int nf_tables_commit_chain_prepare(struct net *net, struct nft_chain *cha
 {
 	const struct nft_expr *expr, *last;
 	struct nft_regs_track track = {};
-	unsigned int size, data_size;
+	unsigned int size, data_size = 0;
 	void *data, *data_boundary;
 	struct nft_rule_dp *prule;
 	struct nft_rule *rule;
-	int i;
 
 	/* already handled or inactive chain? */
 	if (chain->blob_next || !nft_is_active_next(net, chain))
 		return 0;
 
 	rule = list_entry(&chain->rules, struct nft_rule, list);
-	i = 0;
 
 	list_for_each_entry_continue(rule, &chain->rules, list) {
 		if (nft_is_active_next(net, rule)) {
-- 
2.30.2

Re: [PATCH net-next] netfilter: nf_tables: fix compile warnings

[Jakub Kicinski]

On Mon, 10 Jan 2022 23:14:19 +0100 Pablo Neira Ayuso wrote:
> Remove unused variable and fix missing initialization.
> 
> >> net/netfilter/nf_tables_api.c:8266:6: warning: variable 'i' set but not used [-Wunused-but-set-variable]  
>            int i;
>                ^
> >> net/netfilter/nf_tables_api.c:8277:4: warning: variable 'data_size' is uninitialized when used here [-Wuninitialized]  
>                            data_size += sizeof(*prule) + rule->dlen;
>                            ^~~~~~~~~
>    net/netfilter/nf_tables_api.c:8262:30: note: initialize the variable 'data_size' to silence this warning
>            unsigned int size, data_size;
> 
> Fixes: 2c865a8a28a1 ("netfilter: nf_tables: add rule blob layout")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> Please, directly apply to net-next, thanks. Otherwise let me know and
> I'll prepare a pull request with pending fixes once net-next gets merged
> into net.

As you have probably seen Linus fixed this up himself.

You can take the fix for the other warning thru your tree.

Re: [PATCH net-next] netfilter: nf_tables: fix compile warnings

[Pablo Neira Ayuso]

On Mon, Jan 10, 2022 at 08:57:55PM -0800, Jakub Kicinski wrote:
> On Mon, 10 Jan 2022 23:14:19 +0100 Pablo Neira Ayuso wrote:
> > Remove unused variable and fix missing initialization.
> > 
> > >> net/netfilter/nf_tables_api.c:8266:6: warning: variable 'i' set but not used [-Wunused-but-set-variable]  
> >            int i;
> >                ^
> > >> net/netfilter/nf_tables_api.c:8277:4: warning: variable 'data_size' is uninitialized when used here [-Wuninitialized]  
> >                            data_size += sizeof(*prule) + rule->dlen;
> >                            ^~~~~~~~~
> >    net/netfilter/nf_tables_api.c:8262:30: note: initialize the variable 'data_size' to silence this warning
> >            unsigned int size, data_size;
> > 
> > Fixes: 2c865a8a28a1 ("netfilter: nf_tables: add rule blob layout")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> > ---
> > Please, directly apply to net-next, thanks. Otherwise let me know and
> > I'll prepare a pull request with pending fixes once net-next gets merged
> > into net.
> 
> As you have probably seen Linus fixed this up himself.
> 
> You can take the fix for the other warning thru your tree.

That's fine, thanks.