From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 25 Sep 2018 08:08:48 +0000 (+0200)
Subject: libnetlink: don't return error on success
X-Git-Tag: v4.19.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b45e300024bb0936a41821ad75117dc08b65669f;p=thirdparty%2Fiproute2.git

libnetlink: don't return error on success

Change to error handling broke normal code.

Fixes: c60389e4f9ea ("libnetlink: fix leak and using unused memory on error")
Reported-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 586809292..f18dceac2 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -666,17 +666,20 @@ static int __rtnl_talk_iov(struct rtnl_handle *rtnl, struct iovec *iov,
 				if (!err->error)
 					/* check messages from kernel */
 					nl_dump_ext_ack(h, errfn);
+				else {
+					errno = -err->error;
 
-				if (rtnl->proto != NETLINK_SOCK_DIAG &&
-				    show_rtnl_err)
-					rtnl_talk_error(h, err, errfn);
+					if (rtnl->proto != NETLINK_SOCK_DIAG &&
+					    show_rtnl_err)
+						rtnl_talk_error(h, err, errfn);
+				}
 
-				errno = -err->error;
 				if (answer)
 					*answer = (struct nlmsghdr *)buf;
 				else
 					free(buf);
-				return -i;
+
+				return err->error ? -i : 0;
 			}
 
 			if (answer) {