proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 23:09:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: fix memleak on shutdown

Browse Source 
During shutdown, when table_manager_disable is called for the default
VRF, its vrf_id is already set to VRF_UNKNOWN, so the expression is true
and the table manager memory is not freed. Change the expression to
compare the VRF name instead of the id. The check in table_manager_enable
is changed for consistency.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-11-16 00:00:00 +03:00
parent de48804c01
commit 9742796ff1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/table_manager.c
View File

@ -72,7 +72,8 @@ void table_manager_enable(struct zebra_vrf *zvrf)
if (zvrf->tbl_mgr) if (zvrf->tbl_mgr)
return; return;
if (!vrf_is_backend_netns() && zvrf_id(zvrf) != VRF_DEFAULT) { if (!vrf_is_backend_netns()
&& strcmp(zvrf_name(zvrf), VRF_DEFAULT_NAME)) {
struct zebra_vrf *def = zebra_vrf_lookup_by_id(VRF_DEFAULT); struct zebra_vrf *def = zebra_vrf_lookup_by_id(VRF_DEFAULT);
if (def) if (def)
@ -284,7 +285,8 @@ void table_manager_disable(struct zebra_vrf *zvrf)
{ {
if (!zvrf->tbl_mgr) if (!zvrf->tbl_mgr)
return; return;
if (!vrf_is_backend_netns() && zvrf_id(zvrf) != VRF_DEFAULT) { if (!vrf_is_backend_netns()
&& strcmp(zvrf_name(zvrf), VRF_DEFAULT_NAME)) {
zvrf->tbl_mgr = NULL; zvrf->tbl_mgr = NULL;
return; return;
} }