From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Mon, 29 Jan 2018 11:49:37 +0000 (+0100)
Subject: Nest: Fix corner case in recursive next hop lookup
X-Git-Tag: v2.0.2~2^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85ad5855a02e8b185a61bbcb601f005d2e6747db;p=thirdparty%2Fbird.git

Nest: Fix corner case in recursive next hop lookup

Thanks to Svenne Krap for the bugreport.
---

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 4640d6a99..6ee261e80 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2392,12 +2392,13 @@ static int
 rt_update_hostentry(rtable *tab, struct hostentry *he)
 {
   rta *old_src = he->src;
+  int direct = 0;
   int pxlen = 0;
 
   /* Reset the hostentry */
   he->src = NULL;
-  he->nexthop_linkable = 0;
   he->dest = RTD_UNREACHABLE;
+  he->nexthop_linkable = 0;
   he->igp_metric = 0;
 
   net_addr he_addr;
@@ -2417,9 +2418,7 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 	  goto done;
 	}
 
-      he->dest = a->dest;
-      he->nexthop_linkable = 1;
-      if (he->dest == RTD_UNICAST)
+      if (a->dest == RTD_UNICAST)
 	{
 	  for (struct nexthop *nh = &(a->nh); nh; nh = nh->next)
 	    if (ipa_zero(nh->gw))
@@ -2432,12 +2431,13 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 		    goto done;
 		  }
 
-		he->nexthop_linkable = 0;
-		break;
+		direct++;
 	      }
 	}
 
       he->src = rta_clone(a);
+      he->dest = a->dest;
+      he->nexthop_linkable = !direct;
       he->igp_metric = rt_get_igp_metric(e);
     }