Merge pull request #12558 from donaldsharp/bgp_static_route_mem_leak

bgpd: static routes are leaked on shutdown
FRRouting · Dec 27, 2022 · 7430278 · 7430278
2 parents 962ae98 + 1c22515
commit 7430278
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
@@ -500,11 +500,8 @@ static void bgp_connected_cleanup(struct route_table *table,
 	if (!bc)
 		return;
 
-	bc->refcnt--;
-	if (bc->refcnt == 0) {
-		XFREE(MTYPE_BGP_CONN, bc);
-		bgp_dest_set_bgp_connected_ref_info(bn, NULL);
-	}
+	XFREE(MTYPE_BGP_CONN, bc);
+	bgp_dest_set_bgp_connected_ref_info(bn, NULL);
 }
 
 bool bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type,

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -8917,7 +8917,11 @@ void bgp_redistribute_withdraw(struct bgp *bgp, afi_t afi, int type,
 			bgp_aggregate_decrement(bgp, bgp_dest_get_prefix(dest),
 						pi, afi, SAFI_UNICAST);
 			bgp_path_info_delete(dest, pi);
-			bgp_process(bgp, dest, afi, SAFI_UNICAST);
+			if (!CHECK_FLAG(bgp->flags,
+					BGP_FLAG_DELETE_IN_PROGRESS))
+				bgp_process(bgp, dest, afi, SAFI_UNICAST);
+			else
+				bgp_path_info_reap(dest, pi);
 		}
 	}
 }

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -3847,6 +3847,13 @@ struct rfapi_cfg *bgp_rfapi_cfg_new(struct rfapi_rfp_cfg *cfg)
 	return h;
 }
 
+static void bgp_rfapi_rfgn_list_delete(void *data)
+{
+	struct rfapi_rfg_name *rfgn = data;
+	free(rfgn->name);
+	rfgn_free(rfgn);
+}
+
 void bgp_rfapi_cfg_destroy(struct bgp *bgp, struct rfapi_cfg *h)
 {
 	afi_t afi;
@@ -3858,8 +3865,13 @@ void bgp_rfapi_cfg_destroy(struct bgp *bgp, struct rfapi_cfg *h)
 	if (h->l2_groups != NULL)
 		list_delete(&h->l2_groups);
 	list_delete(&h->nve_groups_sequential);
+
+	h->rfg_export_direct_bgp_l->del = bgp_rfapi_rfgn_list_delete;
 	list_delete(&h->rfg_export_direct_bgp_l);
+
+	h->rfg_export_zebra_l->del = bgp_rfapi_rfgn_list_delete;
 	list_delete(&h->rfg_export_zebra_l);
+
 	if (h->default_rt_export_list)
 		ecommunity_free(&h->default_rt_export_list);
 	if (h->default_rt_import_list)