2021-01-28 18:02:35

by Colin King

[permalink] [raw]
Subject: [PATCH] netfilter: nf_tables: remove redundant assignment of variable err

From: Colin Ian King <[email protected]>

The variable err is being assigned a value that is never read,
the same error number is being returned at the error return
path via label err1. Clean up the code by removing the assignment.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <[email protected]>
---
net/netfilter/nft_cmp.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/netfilter/nft_cmp.c b/net/netfilter/nft_cmp.c
index 00e563a72d3d..acbabffefebb 100644
--- a/net/netfilter/nft_cmp.c
+++ b/net/netfilter/nft_cmp.c
@@ -268,10 +268,8 @@ nft_cmp_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[])
if (err < 0)
return ERR_PTR(err);

- if (desc.type != NFT_DATA_VALUE) {
- err = -EINVAL;
+ if (desc.type != NFT_DATA_VALUE)
goto err1;
- }

if (desc.len <= sizeof(u32) && (op == NFT_CMP_EQ || op == NFT_CMP_NEQ))
return &nft_cmp_fast_ops;
--
2.29.2


2021-02-04 00:02:48

by Pablo Neira Ayuso

[permalink] [raw]
Subject: Re: [PATCH] netfilter: nf_tables: remove redundant assignment of variable err

On Thu, Feb 04, 2021 at 12:04:21AM +0100, Pablo Neira Ayuso wrote:
> On Thu, Jan 28, 2021 at 05:59:23PM +0000, Colin King wrote:
> > From: Colin Ian King <[email protected]>
> >
> > The variable err is being assigned a value that is never read,
> > the same error number is being returned at the error return
> > path via label err1. Clean up the code by removing the assignment.
>
> Applied to nf, thanks.

Sorry, I meant, nf-next

2021-02-04 02:11:13

by Pablo Neira Ayuso

[permalink] [raw]
Subject: Re: [PATCH] netfilter: nf_tables: remove redundant assignment of variable err

On Thu, Jan 28, 2021 at 05:59:23PM +0000, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> The variable err is being assigned a value that is never read,
> the same error number is being returned at the error return
> path via label err1. Clean up the code by removing the assignment.

Applied to nf, thanks.