2018-05-23 11:00:52

by Fengguang Wu

Subject: [PATCH] netfilter: nft_numgen: fix ptr_ret.cocci warnings

From: kbuild test robot <[email protected]>

net/netfilter/nft_numgen.c:117:1-3: WARNING: PTR_ERR_OR_ZERO can be used


Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

Fixes: d734a2888922 ("netfilter: nft_numgen: add map lookups for numgen statements")
CC: Laura Garcia Liebana <[email protected]>
Signed-off-by: kbuild test robot <[email protected]>
---

nft_numgen.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

--- a/net/netfilter/nft_numgen.c
+++ b/net/netfilter/nft_numgen.c
@@ -114,10 +114,7 @@ static int nft_ng_inc_map_init(const str
tb[NFTA_NG_SET_NAME],
tb[NFTA_NG_SET_ID], genmask);

- if (IS_ERR(priv->map))
- return PTR_ERR(priv->map);
-
- return 0;
+ return PTR_ERR_OR_ZERO(priv->map);
}

static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,

2018-05-24 10:41:04

by Laura Garcia

Subject: Re: [PATCH] netfilter: nft_numgen: fix ptr_ret.cocci warnings

On Wed, May 23, 2018 at 12:58 PM, kbuild test robot
<[email protected]> wrote:
> From: kbuild test robot <[email protected]>
>
> net/netfilter/nft_numgen.c:117:1-3: WARNING: PTR_ERR_OR_ZERO can be used
>
>
> Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
>
> Generated by: scripts/coccinelle/api/ptr_ret.cocci
>
> Fixes: d734a2888922 ("netfilter: nft_numgen: add map lookups for numgen statements")
> CC: Laura Garcia Liebana <[email protected]>
> Signed-off-by: kbuild test robot <[email protected]>

Acked-by: Laura Garcia Liebana <[email protected]>

2018-06-01 07:47:35

by Pablo Neira Ayuso

Subject: Re: [PATCH] netfilter: nft_numgen: fix ptr_ret.cocci warnings

On Thu, May 24, 2018 at 12:40:04PM +0200, Laura Garcia wrote:
> On Wed, May 23, 2018 at 12:58 PM, kbuild test robot
> <[email protected]> wrote:
> > From: kbuild test robot <[email protected]>
> >
> > net/netfilter/nft_numgen.c:117:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> >
> >
> > Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
> >
> > Generated by: scripts/coccinelle/api/ptr_ret.cocci
> >
> > Fixes: d734a2888922 ("netfilter: nft_numgen: add map lookups for numgen statements")
> > CC: Laura Garcia Liebana <[email protected]>
> > Signed-off-by: kbuild test robot <[email protected]>
>
> Acked-by: Laura Garcia Liebana <[email protected]>

Applied, thanks.