From: Renato Westphal <renato@opensourcerouting.org>
Date: Fri, 27 Jan 2017 20:18:13 +0000 (-0200)
Subject: zebra: fix wrong asserts in netlink code
X-Git-Tag: frr-3.0-branchpoint~57^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e2a534d557d2d62ec7f69a58a1ae263db214ff52;p=mirror%2Ffrr.git

zebra: fix wrong asserts in netlink code

These new asserts were causing zebra to abort when trying to install
MPLS labeled routes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index fb1015e5d5..058d14481e 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -349,7 +349,7 @@ addattr_l (struct nlmsghdr *n, unsigned int maxlen, int type,
   if (data)
     memcpy (RTA_DATA (rta), data, alen);
   else
-    assert (len == 0);
+    assert (alen == 0);
 
   n->nlmsg_len = NLMSG_ALIGN (n->nlmsg_len) + RTA_ALIGN (len);
 
@@ -375,7 +375,7 @@ rta_addattr_l (struct rtattr *rta, unsigned int maxlen, int type,
   if (data)
     memcpy (RTA_DATA (subrta), data, alen);
   else
-    assert (len == 0);
+    assert (alen == 0);
 
   rta->rta_len = NLMSG_ALIGN (rta->rta_len) + RTA_ALIGN (len);