openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: fix ptr_ret.cocci warnings 

net/netfilter/nft_numgen.c:117:1-3: WARNING: PTR_ERR_OR_ZERO can be used
net/netfilter/nft_hash.c:180:1-3: WARNING: PTR_ERR_OR_ZERO can be used
net/netfilter/nft_hash.c:223: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: b9ccc07e3f ("netfilter: nft_hash: add map lookups for hashing operations")
Fixes: d734a28889 ("netfilter: nft_numgen: add map lookups for numgen statements")
CC: Laura Garcia Liebana <nevola@gmail.com>
Signed-off-by: kbuild test robot <fengguang.wu@intel.com>
Acked-by: Laura Garcia Liebana <nevola@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
kbuild test robot 2018-05-23 18:53:48 +08:00 committed by Pablo Neira Ayuso
parent e523452ac0
commit 7849958b51
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/netfilter/nft_hash.c
View File

@ -177,10 +177,7 @@ static int nft_jhash_map_init(const struct nft_ctx *ctx,
priv->map = nft_set_lookup_global(ctx->net, ctx->table, priv->map = nft_set_lookup_global(ctx->net, ctx->table,
tb[NFTA_HASH_SET_NAME], tb[NFTA_HASH_SET_NAME],
tb[NFTA_HASH_SET_ID], genmask); tb[NFTA_HASH_SET_ID], genmask);
if (IS_ERR(priv->map)) return PTR_ERR_OR_ZERO(priv->map);
return PTR_ERR(priv->map);
return 0;
} }
static int nft_symhash_init(const struct nft_ctx *ctx, static int nft_symhash_init(const struct nft_ctx *ctx,
@ -220,10 +217,7 @@ static int nft_symhash_map_init(const struct nft_ctx *ctx,
priv->map = nft_set_lookup_global(ctx->net, ctx->table, priv->map = nft_set_lookup_global(ctx->net, ctx->table,
tb[NFTA_HASH_SET_NAME], tb[NFTA_HASH_SET_NAME],
tb[NFTA_HASH_SET_ID], genmask); tb[NFTA_HASH_SET_ID], genmask);
if (IS_ERR(priv->map)) return PTR_ERR_OR_ZERO(priv->map);
return PTR_ERR(priv->map);
return 0;
} }
static int nft_jhash_dump(struct sk_buff *skb, static int nft_jhash_dump(struct sk_buff *skb,

5
net/netfilter/nft_numgen.c
View File

@ -114,10 +114,7 @@ static int nft_ng_inc_map_init(const struct nft_ctx *ctx,
tb[NFTA_NG_SET_NAME], tb[NFTA_NG_SET_NAME],
tb[NFTA_NG_SET_ID], genmask); tb[NFTA_NG_SET_ID], genmask);
if (IS_ERR(priv->map)) return PTR_ERR_OR_ZERO(priv->map);
return PTR_ERR(priv->map);
return 0;
} }
static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg, static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,