Merge pull request FRRouting#20050 from raja-rajasekar/rajasekarr/l2_l3vni_safefix

bgpd: Link L2VNI to L3VNI only when it really exists

Author: ton31337

bgpd/bgp_evpn_private.h

@@ -280,20 +280,23 @@ static inline void bgpevpn_link_to_l3vni(struct bgpevpn *vpn)
 	if (vpn->bgp_vrf)
 		return;
 
+	/* bail if VRF still doesn't exist */
 	bgp_vrf = bgp_lookup_by_vrf_id(vpn->tenant_vrf_id);
 	if (!bgp_vrf)
 		return;
 
+	/* or if there is no l3vni */
+	if (!bgp_vrf->l3vni)
+		return;
+
 	/* associate the vpn to the bgp_vrf instance */
 	vpn->bgp_vrf = bgp_lock(bgp_vrf);
 	listnode_add_sort(bgp_vrf->l2vnis, vpn);
 
 	/*
-	 * If L3VNI is configured,
 	 * check if we are advertising two labels for this vpn
 	 */
-	if (bgp_vrf->l3vni &&
-	    !CHECK_FLAG(bgp_vrf->vrf_flags, BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY))
+	if (!CHECK_FLAG(bgp_vrf->vrf_flags, BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY))
 		SET_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS);
 
 	bgp_evpn_es_evi_vrf_ref(vpn);