Merge pull request FRRouting#14894 from louis-6wind/bestpath-heap

bgpd: fix bgp_best_selection heap-use-after-free
qlyoung · Nov 29, 2023 · e6e846d · e6e846d
2 parents fc8a074 + 9561f96
commit e6e846d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -2824,18 +2824,18 @@ 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)) {
-				dest = bgp_path_info_reap(dest, pi);
-				assert(dest);
-			}
-
 			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)) {
+				dest = bgp_path_info_reap(dest, pi);
+				assert(dest);
+			}
+
 			continue;
 		}