]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
KRT: Fix bug in multipath handling
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Mon, 11 Dec 2017 00:04:15 +0000 (01:04 +0100)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Mon, 11 Dec 2017 00:04:15 +0000 (01:04 +0100)
sysdep/linux/netlink.c

index afb9dc8ba083a198f772b11ca75c89cacf077f87..76ffe78b31fbe1e2c67db15118535acabafbaae1 100644 (file)
@@ -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;