Merge pull request #20078 from c-po/backport-19879

bgpd: Crash due to usage of freed up evpn_overlay attr (backport #19879) with fixed conflicts

Author: donaldsharp

bgpd/bgp_attr.c

@@ -549,7 +549,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;
 

bgpd/bgp_attr.h

@@ -660,5 +660,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 */

bgpd/bgp_route.c

@@ -4641,10 +4641,12 @@ 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) {
-			if (afi == AFI_L2VPN)
+			if (afi == AFI_L2VPN) {
+				evpn = evpn_overlay_intern(evpn);
 				bgp_attr_set_evpn_overlay(attr, evpn);
-			else
+			} else {
 				evpn_overlay_free(evpn);
+			}
 		}
 		bgp_adj_in_set(dest, peer, attr, addpath_id, &bgp_labels);
 	}