| Message ID | 1510640416-114375-1-git-send-email-weiyongjun1@huawei.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [ovs-dev,net-next] openvswitch: Fix return value check in ovs_meter_cmd_features() | expand |
On Tue, Nov 14, 2017 at 11:50 AM, Wei Yongjun <weiyongjun1@huawei.com> wrote: > In case of error, the function ovs_meter_cmd_reply_start() returns > ERR_PTR() not NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Fixes: 96fbc13d7e77 ("openvswitch: Add meter infrastructure") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Pravin B Shelar <pshelar@ovn.org>
From: Wei Yongjun <weiyongjun1@huawei.com> Date: Tue, 14 Nov 2017 06:20:16 +0000 > In case of error, the function ovs_meter_cmd_reply_start() returns > ERR_PTR() not NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Fixes: 96fbc13d7e77 ("openvswitch: Add meter infrastructure") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied.
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c index 2a5ba35..2e58b6c 100644 --- a/net/openvswitch/meter.c +++ b/net/openvswitch/meter.c @@ -166,7 +166,7 @@ static int ovs_meter_cmd_features(struct sk_buff *skb, struct genl_info *info) reply = ovs_meter_cmd_reply_start(info, OVS_METER_CMD_FEATURES, &ovs_reply_header); - if (!reply) + if (IS_ERR(reply)) return PTR_ERR(reply); if (nla_put_u32(reply, OVS_METER_ATTR_MAX_METERS, U32_MAX) ||
In case of error, the function ovs_meter_cmd_reply_start() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 96fbc13d7e77 ("openvswitch: Add meter infrastructure") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- net/openvswitch/meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)