2020-10-31 06:03:56

by Yue Haibing

Subject: [PATCH net-next] openvswitch: Use IS_ERR instead of IS_ERR_OR_NULL

Fix smatch warning:

net/openvswitch/meter.c:427 ovs_meter_cmd_set() warn: passing zero to 'PTR_ERR'

dp_meter_create() never returns NULL, use IS_ERR
instead of IS_ERR_OR_NULL to fix this.

Signed-off-by: YueHaibing <[email protected]>
---
net/openvswitch/meter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 8fbefd52af7f..15424d26e85d 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -423,7 +423,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
return -EINVAL;

meter = dp_meter_create(a);
- if (IS_ERR_OR_NULL(meter))
+ if (IS_ERR(meter))
return PTR_ERR(meter);

reply = ovs_meter_cmd_reply_start(info, OVS_METER_CMD_SET,
--
2.17.1

2020-11-02 01:28:44

by Tonghao Zhang

Subject: Re: [PATCH net-next] openvswitch: Use IS_ERR instead of IS_ERR_OR_NULL

On Sat, Oct 31, 2020 at 2:02 PM YueHaibing <[email protected]> wrote:
>
> Fix smatch warning:
>
> net/openvswitch/meter.c:427 ovs_meter_cmd_set() warn: passing zero to 'PTR_ERR'
>
> dp_meter_create() never returns NULL, use IS_ERR
> instead of IS_ERR_OR_NULL to fix this.
>
> Signed-off-by: YueHaibing <[email protected]>
Acked-by: Tonghao Zhang <[email protected]>
> ---
> net/openvswitch/meter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
> index 8fbefd52af7f..15424d26e85d 100644
> --- a/net/openvswitch/meter.c
> +++ b/net/openvswitch/meter.c
> @@ -423,7 +423,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
> return -EINVAL;
>
> meter = dp_meter_create(a);
> - if (IS_ERR_OR_NULL(meter))
> + if (IS_ERR(meter))
> return PTR_ERR(meter);
>
> reply = ovs_meter_cmd_reply_start(info, OVS_METER_CMD_SET,
> --
> 2.17.1
>


--
Best regards, Tonghao

2020-11-03 01:38:19

by Jakub Kicinski

Subject: Re: [PATCH net-next] openvswitch: Use IS_ERR instead of IS_ERR_OR_NULL

On Sat, 31 Oct 2020 14:01:53 +0800 YueHaibing wrote:
> Fix smatch warning:
>
> net/openvswitch/meter.c:427 ovs_meter_cmd_set() warn: passing zero to 'PTR_ERR'
>
> dp_meter_create() never returns NULL, use IS_ERR
> instead of IS_ERR_OR_NULL to fix this.
>
> Signed-off-by: YueHaibing <[email protected]>

Applied, thanks!