From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Mon, 11 Dec 2017 00:04:15 +0000 (+0100)
Subject: KRT: Fix bug in multipath handling
X-Git-Tag: v2.0.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99050cce228b214c2856c6eebefbefffccade7f;p=thirdparty%2Fbird.git

KRT: Fix bug in multipath handling
---

diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index afb9dc8ba..76ffe78b3 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -677,8 +677,10 @@ nl_parse_multipath(struct krt_proto *p, struct rtattr *ra, int af)
 	nh_buf_size = nh_buf_size ? (nh_buf_size * 2) : 4;
 	nh_buffer = xrealloc(nh_buffer, nh_buf_size * NEXTHOP_MAX_SIZE);
       }
-      *last = rv = nh_buffer + nh_buf_used++;
-      rv->next = NULL;
+      /* FIXME: This is really ugly */
+      *last = rv = (void *) (((byte *) nh_buffer) + (nh_buf_used++ * NEXTHOP_MAX_SIZE));
+      memset(rv, 0, NEXTHOP_MAX_SIZE);
+      // rv->next = NULL;
       last = &(rv->next);
 
       rv->flags = 0;