diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2025-02-17 13:05:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-17 13:05:21 -0600 |
| commit | 33ed0a3315682382cfbac4a6b3ff4f18b67f69d1 (patch) | |
| tree | e5e3b293bc9a2f824c32a2f69b995fca5c72af0b /bgpd/bgp_mplsvpn.c | |
| parent | bb22e8b24b8d785d270952f11db862479a675640 (diff) | |
| parent | ba721ac7f7606ac69e29efa70fddc6a51cb65f6a (diff) | |
Merge pull request #18143 from FRRouting/mergify/bp/dev/10.3/pr-18079
bgpd: Fix crash in bgp_labelpool (backport #18079)
Diffstat (limited to 'bgpd/bgp_mplsvpn.c')
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 46e529f03d..580561aa9e 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1450,7 +1450,7 @@ _vpn_leak_from_vrf_get_per_nexthop_label(struct bgp_path_info *pi, /* request a label to zebra for this nexthop * the response from zebra will trigger the callback */ - bgp_lp_get(LP_TYPE_NEXTHOP, blnc, + bgp_lp_get(LP_TYPE_NEXTHOP, blnc, from_bgp->vrf_id, bgp_mplsvpn_get_label_per_nexthop_cb); } @@ -1490,7 +1490,8 @@ static mpls_label_t bgp_mplsvpn_get_vpn_label(struct vpn_policy *bgp_policy) { if (bgp_policy->tovpn_label == MPLS_LABEL_NONE && CHECK_FLAG(bgp_policy->flags, BGP_VPN_POLICY_TOVPN_LABEL_AUTO)) { - bgp_lp_get(LP_TYPE_VRF, bgp_policy, vpn_leak_label_callback); + bgp_lp_get(LP_TYPE_VRF, bgp_policy, bgp_policy->bgp->vrf_id, + vpn_leak_label_callback); return MPLS_INVALID_LABEL; } return bgp_policy->tovpn_label; @@ -4387,7 +4388,7 @@ void bgp_mplsvpn_nh_label_bind_register_local_label(struct bgp *bgp, label); bmnc->bgp_vpn = bgp; bmnc->allocation_in_progress = true; - bgp_lp_get(LP_TYPE_BGP_L3VPN_BIND, bmnc, + bgp_lp_get(LP_TYPE_BGP_L3VPN_BIND, bmnc, bgp->vrf_id, bgp_mplsvpn_nh_label_bind_get_local_label_cb); } |