Merge pull request FRRouting#19879 from soumyar-roy/soumya/evpn_attr_crash

ton31337 · web-flow · commit 29eb3bc13945 · 2025-10-29T10:04:59.000+02:00
bgpd: Crash due to usage of freed up evpn_overlay attr
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
@@ -554,7 +554,7 @@ void evpn_overlay_free(struct bgp_route_evpn *bre)
 	XFREE(MTYPE_BGP_EVPN_OVERLAY, bre);
 }
 
-static struct bgp_route_evpn *evpn_overlay_intern(struct bgp_route_evpn *bre)
+struct bgp_route_evpn *evpn_overlay_intern(struct bgp_route_evpn *bre)
 {
 	struct bgp_route_evpn *find;
 
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
@@ -683,5 +683,6 @@ bgp_attr_set_vnc_subtlvs(struct attr *attr,
 
 extern bool route_matches_soo(struct bgp_path_info *pi, struct ecommunity *soo);
 extern void evpn_overlay_free(struct bgp_route_evpn *bre);
+extern struct bgp_route_evpn *evpn_overlay_intern(struct bgp_route_evpn *bre);
 
 #endif /* _QUAGGA_BGP_ATTR_H */
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -5197,6 +5197,7 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
 		 * attr->evpn_overlay, so that, this can be stored in adj_in.
 		 */
 		if (evpn && afi == AFI_L2VPN) {
+			evpn = evpn_overlay_intern(evpn);
 			bgp_attr_set_evpn_overlay(attr, evpn);
 			p_evpn = NULL;
 		}

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ void evpn_overlay_free(struct bgp_route_evpn *bre)`
`554`	`554`	`XFREE(MTYPE_BGP_EVPN_OVERLAY, bre);`
`555`	`555`	`}`
`556`	`556`
`557`		`-static struct bgp_route_evpn evpn_overlay_intern(struct bgp_route_evpn bre)`
	`557`	`+struct bgp_route_evpn evpn_overlay_intern(struct bgp_route_evpn bre)`
`558`	`558`	`{`
`559`	`559`	`struct bgp_route_evpn *find;`
`560`	`560`
Original file line number	Diff line number	Diff line change
`@@ -5197,6 +5197,7 @@ void bgp_update(struct peer peer, const struct prefix p, uint32_t addpath_id,`
`5197`	`5197`	`* attr->evpn_overlay, so that, this can be stored in adj_in.`
`5198`	`5198`	`*/`
`5199`	`5199`	`if (evpn && afi == AFI_L2VPN) {`
	`5200`	`+ evpn = evpn_overlay_intern(evpn);`
`5200`	`5201`	`bgp_attr_set_evpn_overlay(attr, evpn);`
`5201`	`5202`	`p_evpn = NULL;`
`5202`	`5203`	`}`