Merge pull request FRRouting#2704 from sworleys/Netlink-Nexthop-Hang

zebra: Add check for nexthop loop to prevent hanging
qlyoung · Jul 24, 2018 · 4dbd617 · 4dbd617
2 parents 72794b3 + 3c04071
commit 4dbd617
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
@@ -580,6 +580,9 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
 					route_entry_nexthop_ifindex_add(
 						re, index, nh_vrf_id);
 
+				if (rtnh->rtnh_len == 0)
+					break;
+
 				len -= NLMSG_ALIGN(rtnh->rtnh_len);
 				rtnh = RTNH_NEXT(rtnh);
 			}
@@ -700,6 +703,9 @@ static int netlink_route_change_read_multicast(struct nlmsghdr *h,
 			oif[oif_count] = rtnh->rtnh_ifindex;
 			oif_count++;
 
+			if (rtnh->rtnh_len == 0)
+				break;
+
 			len -= NLMSG_ALIGN(rtnh->rtnh_len);
 			rtnh = RTNH_NEXT(rtnh);
 		}