[ovs-dev,v2,05/11] datapath: Fix return value check in ovs_meter_cmd_features()

Message ID 1518018601-31980-6-git-send-email-gvrose8192@gmail.com
State Accepted
Headers show
Series
  • Add upstream Linux 4.14 kernel support
Related show

Commit Message

Gregory Rose Feb. 7, 2018, 3:49 p.m.
From: Wei Yongjun <weiyongjun1@huawei.com>

Upstream commit:
    commit 8a860c2bcc84a8e4fbcabb928cd97e4c51b17d93
    Author: Wei Yongjun <weiyongjun1@huawei.com>
    Date:   Tue Nov 14 06:20:16 2017 +0000

    openvswitch: Fix return value check in ovs_meter_cmd_features()

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Cc: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
 datapath/meter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/datapath/meter.c b/datapath/meter.c
index 1ab965d..bc940ae 100644
--- a/datapath/meter.c
+++ b/datapath/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) ||