Merge pull request #14904 from opensourcerouting/fix/9561f9671dbfb77e…

…c7d319cd19c88e4be506004b_9.0 bgpd: fix bgp_best_selection heap-use-after-free
FRRouting · Nov 29, 2023 · 88950a3 · 88950a3
2 parents cf8f9f9 + 3f9c59d
commit 88950a3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -2758,16 +2758,16 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
 			/* reap REMOVED routes, if needs be
 			 * selected route must stay for a while longer though
 			 */
-			if (CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)
-			    && (pi != old_select))
-				bgp_path_info_reap(dest, pi);
-
 			if (debug)
 				zlog_debug(
 					"%s: %pBD(%s) pi from %s in holddown",
 					__func__, dest, bgp->name_pretty,
 					pi->peer->host);
 
+			if (CHECK_FLAG(pi->flags, BGP_PATH_REMOVED) &&
+			    (pi != old_select))
+				bgp_path_info_reap(dest, pi);
+
 			continue;
 		}