proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14047 from FRRouting/mergify/bp/dev/9.0/pr-13918

Browse Source 
bgpd: fix bgp evpn cli memory leaks. (backport #13918)
This commit is contained in:
Donatas Abraitis 2023-07-19 14:09:01 +03:00 committed by GitHub
commit c3ac75aaf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_evpn_vty.c
View File

@ -6853,6 +6853,8 @@ DEFUN(bgp_evpn_ead_es_rt, bgp_evpn_ead_es_rt_cmd,
if (!bgp_evpn_rt_matches_existing(bgp_mh_info->ead_es_export_rtl, if (!bgp_evpn_rt_matches_existing(bgp_mh_info->ead_es_export_rtl,
ecomadd)) ecomadd))
bgp_evpn_mh_config_ead_export_rt(bgp, ecomadd, false); bgp_evpn_mh_config_ead_export_rt(bgp, ecomadd, false);
else
ecommunity_free(&ecomadd);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -6890,6 +6892,7 @@ DEFUN(no_bgp_evpn_ead_es_rt, no_bgp_evpn_ead_es_rt_cmd,
} }
bgp_evpn_mh_config_ead_export_rt(bgp, ecomdel, true); bgp_evpn_mh_config_ead_export_rt(bgp, ecomdel, true);
ecommunity_free(&ecomdel);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -6941,6 +6944,8 @@ DEFUN (bgp_evpn_vni_rt,
/* Do nothing if we already have this import route-target */ /* Do nothing if we already have this import route-target */
if (!bgp_evpn_rt_matches_existing(vpn->import_rtl, ecomadd)) if (!bgp_evpn_rt_matches_existing(vpn->import_rtl, ecomadd))
evpn_configure_import_rt(bgp, vpn, ecomadd); evpn_configure_import_rt(bgp, vpn, ecomadd);
else
ecommunity_free(&ecomadd);
} }
/* Add/update the export route-target */ /* Add/update the export route-target */
@ -6957,6 +6962,8 @@ DEFUN (bgp_evpn_vni_rt,
/* Do nothing if we already have this export route-target */ /* Do nothing if we already have this export route-target */
if (!bgp_evpn_rt_matches_existing(vpn->export_rtl, ecomadd)) if (!bgp_evpn_rt_matches_existing(vpn->export_rtl, ecomadd))
evpn_configure_export_rt(bgp, vpn, ecomadd); evpn_configure_export_rt(bgp, vpn, ecomadd);
else
ecommunity_free(&ecomadd);
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -7064,6 +7071,7 @@ DEFUN (no_bgp_evpn_vni_rt,
} }
} }
ecommunity_free(&ecomdel);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

2
bgpd/bgp_vty.c
View File

@ -8567,6 +8567,8 @@ DEFPY (neighbor_soo,
ecommunity_free(&peer->soo[afi][safi]); ecommunity_free(&peer->soo[afi][safi]);
peer->soo[afi][safi] = ecomm_soo; peer->soo[afi][safi] = ecomm_soo;
peer_af_flag_unset(peer, afi, safi, PEER_FLAG_SOO); peer_af_flag_unset(peer, afi, safi, PEER_FLAG_SOO);
} else {
ecommunity_free(&ecomm_soo);
} }
return bgp_vty_return(vty, return bgp_vty_return(vty,