proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 03:28:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: fix memleak when deleting area and instance

Browse Source 
Release memory for all redistributed route info.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-05-09 16:09:38 +03:00
parent 8c6482db8c
commit 46c9042fbc
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
isisd/isis_redist.c
View File

@ -391,12 +391,19 @@ static void isis_redist_update_zebra_subscriptions(struct isis *isis)
void isis_redist_free(struct isis *isis) void isis_redist_free(struct isis *isis)
{ {
struct route_node *rn;
int i; int i;
for (i = 0; i < REDIST_PROTOCOL_COUNT; i++) { for (i = 0; i < REDIST_PROTOCOL_COUNT; i++) {
if (!isis->ext_info[i]) if (!isis->ext_info[i])
continue; continue;
for (rn = route_top(isis->ext_info[i]); rn;
rn = srcdest_route_next(rn)) {
if (rn->info)
XFREE(MTYPE_ISIS_EXT_INFO, rn->info);
}
route_table_finish(isis->ext_info[i]); route_table_finish(isis->ext_info[i]);
isis->ext_info[i] = NULL; isis->ext_info[i] = NULL;
} }
@ -504,6 +511,7 @@ void isis_redist_unset(struct isis_area *area, int level, int family, int type)
void isis_redist_area_finish(struct isis_area *area) void isis_redist_area_finish(struct isis_area *area)
{ {
struct route_node *rn;
int protocol; int protocol;
int level; int level;
int type; int type;
@ -518,7 +526,15 @@ void isis_redist_area_finish(struct isis_area *area)
redist->redist = 0; redist->redist = 0;
XFREE(MTYPE_ISIS_RMAP_NAME, redist->map_name); XFREE(MTYPE_ISIS_RMAP_NAME, redist->map_name);
} }
if (!area->ext_reach[protocol][level])
continue;
for (rn = route_top(area->ext_reach[protocol][level]);
rn; rn = srcdest_route_next(rn)) {
if (rn->info)
XFREE(MTYPE_ISIS_EXT_INFO, rn->info);
}
route_table_finish(area->ext_reach[protocol][level]); route_table_finish(area->ext_reach[protocol][level]);
area->ext_reach[protocol][level] = NULL;
} }
isis_redist_update_zebra_subscriptions(area->isis); isis_redist_update_zebra_subscriptions(area->isis);