proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 19:43:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16936 from FRRouting/mergify/bp/stable/10.1/pr-16579

Browse Source 
bgpd: Avoid use-after-free when doing `no router bgp` with auto created instances (backport #16579)
This commit is contained in:
Donald Sharp 2024-09-26 15:56:19 -04:00 committed by GitHub
commit cf5b42e3fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bgpd/bgp_vty.c
View File

@ -1695,15 +1695,18 @@ DEFUN (no_router_bgp,
/* Cannot delete default instance if vrf instances exist */ /* Cannot delete default instance if vrf instances exist */
if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) { if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) {
struct listnode *node; struct listnode *node, *nnode;
struct bgp *tmp_bgp; struct bgp *tmp_bgp;
for (ALL_LIST_ELEMENTS_RO(bm->bgp, node, tmp_bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, tmp_bgp)) {
if (tmp_bgp->inst_type != BGP_INSTANCE_TYPE_VRF) if (tmp_bgp->inst_type != BGP_INSTANCE_TYPE_VRF)
continue; continue;
if (CHECK_FLAG(tmp_bgp->vrf_flags, BGP_VRF_AUTO)) if (CHECK_FLAG(tmp_bgp->vrf_flags,
BGP_VRF_AUTO)) {
bgp_delete(tmp_bgp); bgp_delete(tmp_bgp);
continue;
}
if (CHECK_FLAG( if (CHECK_FLAG(
tmp_bgp->af_flags[AFI_IP] tmp_bgp->af_flags[AFI_IP]