rtnl/route: only consider negative error codes as error

The convention is that negative values are errors. Positive values are undefined,
but when in doubt, they are not errors. In these cases it makes no difference. The
code won't return positive values.

8 files changed, 27 insertions, 22 deletions

diff --git a/lib/route/act.c b/lib/route/act.c
index a0aff7f..485e2a5 100644
--- a/lib/route/act.c
+++ b/lib/route/act.c
@@ -17,6 +17,7 @@
  */
 
 #include <netlink-private/netlink.h>
+#include <netlink-private/utils.h>
 #include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
@@ -125,7 +126,7 @@ int rtnl_act_fill(struct nl_msg *msg, int attrtype, struct rtnl_act *act)
 
 	while (p_act) {
 		err = rtnl_act_fill_one(msg, p_act, ++order);
-		if (err)
+		if (err < 0)
 			return err;
 		p_act = p_act->a_next;
 	}
@@ -519,8 +520,13 @@ static int act_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
 	p_act = act;
 	while(p_act) {
 		err = pp->pp_cb(OBJ_CAST(act), pp);
-		if (err)
+		if (err) {
+			if (err > 0) {
+				_nl_assert_not_reached();
+				err = -NLE_FAILURE;
+			}
 			break;
+		}
 		p_act = p_act->a_next;
 	}
 errout:
diff --git a/lib/route/cls/basic.c b/lib/route/cls/basic.c
index 3581c60..30fc390 100644
--- a/lib/route/cls/basic.c
+++ b/lib/route/cls/basic.c
@@ -93,7 +93,7 @@ static int basic_msg_parser(struct rtnl_tc *tc, void *data)
 	if (tb[TCA_BASIC_ACT]) {
 		b->b_mask |= BASIC_ATTR_ACTION;
 		err = rtnl_act_parse(&b->b_act, tb[TCA_BASIC_ACT]);
-		if (err)
+		if (err < 0)
 			return err;
 	}
 
diff --git a/lib/route/cls/mall.c b/lib/route/cls/mall.c
index e13ee92..8a98403 100644
--- a/lib/route/cls/mall.c
+++ b/lib/route/cls/mall.c
@@ -108,7 +108,7 @@ int rtnl_mall_append_action(struct rtnl_cls *cls, struct rtnl_act *act)
 
 	mall->m_mask |= MALL_ATTR_ACTION;
 	err = rtnl_act_append(&mall->m_act, act);
-	if (err)
+	if (err < 0)
 	        return err;
 
 	rtnl_act_get(act);
@@ -188,7 +188,7 @@ static int mall_msg_parser(struct rtnl_tc *tc, void *data)
 	if (tb[TCA_MATCHALL_ACT]) {
 		mall->m_mask |= MALL_ATTR_ACTION;
 		err = rtnl_act_parse(&mall->m_act, tb[TCA_MATCHALL_ACT]);
-		if (err)
+		if (err < 0)
 			return err;
 	}
 
@@ -212,13 +212,13 @@ static int mall_msg_fill(struct rtnl_tc *tc, void *data, struct nl_msg *msg)
 		int err;
 
 		err = rtnl_act_fill(msg, TCA_MATCHALL_ACT, mall->m_act);
-		if (err)
+		if (err < 0)
 			return err;
 	}
 
 	return 0;
 
- nla_put_failure:
+nla_put_failure:
 	return -NLE_NOMEM;
 }
 
diff --git a/lib/route/cls/u32.c b/lib/route/cls/u32.c
index f06bc24..4853930 100644
--- a/lib/route/cls/u32.c
+++ b/lib/route/cls/u32.c
@@ -121,7 +121,7 @@ static int u32_msg_parser(struct rtnl_tc *tc, void *data)
 	if (tb[TCA_U32_ACT]) {
 		u->cu_mask |= U32_ATTR_ACTION;
 		err = rtnl_act_parse(&u->cu_act, tb[TCA_U32_ACT]);
-		if (err)
+		if (err < 0)
 			return err;
 	}
 
@@ -373,7 +373,7 @@ static int u32_msg_fill(struct rtnl_tc *tc, void *data, struct nl_msg *msg)
 		int err;
 
 		err = rtnl_act_fill(msg, TCA_U32_ACT, u->cu_act);
-		if (err)
+		if (err < 0)
 			return err;
 	}
 
diff --git a/lib/route/link.c b/lib/route/link.c
index 4bcde96..0ce4b0a 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -818,13 +818,13 @@ static int link_request_update(struct nl_cache *cache, struct nl_sock *sk)
 	ops = rtnl_link_af_ops_lookup(family);
 	if (ops && ops->ao_get_af) {
 		err = ops->ao_get_af(msg, &ext_filter_mask);
-		if (err)
+		if (err < 0)
 			goto nla_put_failure;
 	}
 
 	if (ext_filter_mask) {
 		err = nla_put(msg, IFLA_EXT_MASK, sizeof(ext_filter_mask), &ext_filter_mask);
-		if (err)
+		if (err < 0)
 			goto nla_put_failure;
 	}
 
@@ -1396,7 +1396,7 @@ int rtnl_link_build_get_request(int ifindex, const char *name,
 		NLA_PUT_STRING(msg, IFLA_IFNAME, name);
 
 	err = nla_put(msg, IFLA_EXT_MASK, sizeof(vf_mask), &vf_mask);
-	if (err)
+	if (err < 0)
 		goto nla_put_failure;
 
 	*result = msg;
diff --git a/lib/route/nexthop_encap.c b/lib/route/nexthop_encap.c
index 21f647a..94bcb60 100644
--- a/lib/route/nexthop_encap.c
+++ b/lib/route/nexthop_encap.c
@@ -55,7 +55,7 @@ int nh_encap_build_msg(struct nl_msg *msg, struct rtnl_nh_encap *rtnh_encap)
 		goto nla_put_failure;
 
 	err = rtnh_encap->ops->build_msg(msg, rtnh_encap->priv);
-	if (err)
+	if (err < 0)
 		return err;
 
 	nla_nest_end(msg, encap);
diff --git a/lib/route/nh_encap_mpls.c b/lib/route/nh_encap_mpls.c
index 081661e..89972bb 100644
--- a/lib/route/nh_encap_mpls.c
+++ b/lib/route/nh_encap_mpls.c
@@ -34,7 +34,7 @@ static int mpls_encap_build_msg(struct nl_msg *msg, void *priv)
 	return 0;
 
 nla_put_failure:
-        return -NLE_MSGSIZE;
+	return -NLE_MSGSIZE;
 }
 
 static void mpls_encap_destructor(void *priv)
@@ -56,9 +56,8 @@ static int mpls_encap_parse_msg(struct nlattr *nla, struct rtnl_nexthop *nh)
 	uint8_t ttl = 0;
 	int err;
 
-
 	err = nla_parse_nested(tb, MPLS_IPTUNNEL_MAX, nla, mpls_encap_policy);
-	if (err)
+	if (err < 0)
 		return err;
 
 	if (!tb[MPLS_IPTUNNEL_DST])
diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index bacabe8..b5cc4ed 100644
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -1077,7 +1077,7 @@ static int parse_multipath(struct rtnl_route *route, struct nlattr *attr)
 
 				err = rtnl_route_nh_set_newdst(nh, addr);
 				nl_addr_put(addr);
-				if (err)
+				if (err < 0)
 					goto errout;
 			}
 
@@ -1090,7 +1090,7 @@ static int parse_multipath(struct rtnl_route *route, struct nlattr *attr)
 
 				err = rtnl_route_nh_set_via(nh, addr);
 				nl_addr_put(addr);
-				if (err)
+				if (err < 0)
 					goto errout;
 			}
 
@@ -1098,7 +1098,7 @@ static int parse_multipath(struct rtnl_route *route, struct nlattr *attr)
 				err = nh_encap_parse_msg(ntb[RTA_ENCAP],
 							 ntb[RTA_ENCAP_TYPE],
 							 nh);
-				if (err)
+				if (err < 0)
 					goto errout;
 			}
 		}
@@ -1267,7 +1267,7 @@ int rtnl_route_parse(struct nlmsghdr *nlh, struct rtnl_route **result)
 
 		err = rtnl_route_nh_set_newdst(old_nh, addr);
 		nl_addr_put(addr);
-		if (err)
+		if (err < 0)
 			goto errout;
 	}
 
@@ -1284,7 +1284,7 @@ int rtnl_route_parse(struct nlmsghdr *nlh, struct rtnl_route **result)
 
 		err = rtnl_route_nh_set_via(old_nh, addr);
 		nl_addr_put(addr);
-		if (err)
+		if (err < 0)
 			goto errout;
 	}
 
@@ -1299,7 +1299,7 @@ int rtnl_route_parse(struct nlmsghdr *nlh, struct rtnl_route **result)
 
 		err = nh_encap_parse_msg(tb[RTA_ENCAP],
 					 tb[RTA_ENCAP_TYPE], old_nh);
-		if (err)
+		if (err < 0)
 			goto errout;
 	}