Merge pull request #19577 from mjstapp/fix_bgp_term_refs

bgpd: fix refcounts at termination

Author: Jafaral

bgpd/bgp_table.c

@@ -101,7 +101,7 @@ inline struct bgp_dest *bgp_dest_unlock_node(struct bgp_dest *dest)
  * bgp_node_destroy
  */
 static void bgp_node_destroy(route_table_delegate_t *delegate,
-							struct route_table *table, struct route_node *node)
+			     struct route_table *table, struct route_node *node)
 {
 	struct bgp_dest *dest;
 	struct bgp_table *rt;
@@ -110,8 +110,8 @@ static void bgp_node_destroy(route_table_delegate_t *delegate,
 	if (dest) {
 		if (rt->bgp) {
 			bgp_addpath_free_node_data(&rt->bgp->tx_addpath,
-										&dest->tx_addpath,
-										rt->afi, rt->safi);
+						   &dest->tx_addpath,
+						   rt->afi, rt->safi);
 		}
 		XFREE(MTYPE_BGP_NODE, dest);
 		node->info = NULL;

bgpd/bgpd.c

@@ -4205,6 +4205,15 @@ int bgp_delete(struct bgp *bgp)
 	event_cancel(&bgp->t_maxmed_onstartup);
 	event_cancel(&bgp->t_update_delay);
 	event_cancel(&bgp->t_establish_wait);
+
+	/* If the clearing event is scheduled, there's an extra ref to
+	 * this 'bgp' - ensure we unlock.
+	 */
+	if (event_is_scheduled(bgp->clearing_end)) {
+		assert(bgp->lock > 1);
+		bgp_unlock(bgp);
+	}
+
 	event_cancel(&bgp->clearing_end);
 
 	/* Set flag indicating bgp instance delete in progress */