diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2023-04-19 23:06:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 23:06:24 -0500 |
| commit | 16f8b0fb7f857b610651bc1f798c981986360c2d (patch) | |
| tree | 5e3f09ffa7c3bcc38653e757fd720234f6adfb95 | |
| parent | 165ed0bf893f5c50be21fc3aa20457ac19417332 (diff) | |
| parent | ea004fb1f3a8f9e675546768725823a3f5c7de05 (diff) | |
Merge pull request #13338 from FRRouting/mergify/bp/stable/8.5/pr-13329
bgpd: Fix for ain->attr corruption during path update (backport #13329)
| -rw-r--r-- | bgpd/bgp_route.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 7bb6a0e5bc..f4dff0d802 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -4031,17 +4031,24 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id, if (has_valid_label) assert(label != NULL); - /* Update overlay index of the attribute */ - if (afi == AFI_L2VPN && evpn) - memcpy(&attr->evpn_overlay, evpn, - sizeof(struct bgp_route_evpn)); /* When peer's soft reconfiguration enabled. Record input packet in Adj-RIBs-In. */ - if (!soft_reconfig - && CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_SOFT_RECONFIG) - && peer != bgp->peer_self) + if (!soft_reconfig && + CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_SOFT_RECONFIG) && + peer != bgp->peer_self) { + /* + * If the trigger is not from soft_reconfig and if + * PEER_FLAG_SOFT_RECONFIG is enabled for the peer, then attr + * will not be interned. In which case, it is ok to update the + * attr->evpn_overlay, so that, this can be stored in adj_in. + */ + if ((afi == AFI_L2VPN) && evpn) { + memcpy(&attr->evpn_overlay, evpn, + sizeof(struct bgp_route_evpn)); + } bgp_adj_in_set(dest, peer, attr, addpath_id); + } /* Update permitted loop count */ if (CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_ALLOWAS_IN)) @@ -4169,6 +4176,15 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id, } new_attr = *attr; + /* + * If bgp_update is called with soft_reconfig set then + * attr is interned. In this case, do not overwrite the + * attr->evpn_overlay with evpn directly. Instead memcpy + * evpn to new_atr.evpn_overlay before it is interned. + */ + if (soft_reconfig && (afi == AFI_L2VPN) && evpn) + memcpy(&new_attr.evpn_overlay, evpn, + sizeof(struct bgp_route_evpn)); /* Apply incoming route-map. * NB: new_attr may now contain newly allocated values from route-map |