matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18526 from donaldsharp/pim_leakage

Browse source 
pimd: Fix memory leak on shutdown
This commit is contained in:
Jafar Al-Gharaibeh 2025-04-08 10:19:33 -05:00 committed by GitHub
parent 4d18be4faf 521b58945c
commit 3510904f1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pimd/pim_iface.c
View file

@ -195,8 +195,17 @@ void pim_if_delete(struct interface *ifp)
assert(pim_ifp); assert(pim_ifp);
pim_ifp->pim->mcast_if_count--; pim_ifp->pim->mcast_if_count--;
if (pim_ifp->gm_join_list) if (pim_ifp->gm_join_list) {
pim_if_gm_join_del_all(ifp); pim_if_gm_join_del_all(ifp);
/*
* Sometimes gm_join_del_all does not delete them all
* and as such it's not actually freed. Let's
* just clean this up if it wasn't to prevent
* the problem.
*/
if (pim_ifp->gm_join_list)
list_delete(&pim_ifp->gm_join_list);
}
if (pim_ifp->static_group_list) if (pim_ifp->static_group_list)
pim_if_static_group_del_all(ifp); pim_if_static_group_del_all(ifp);
@ -1437,10 +1446,8 @@ int pim_if_gm_join_del(struct interface *ifp, pim_addr group_addr,
} }
listnode_delete(pim_ifp->gm_join_list, ij); listnode_delete(pim_ifp->gm_join_list, ij);
gm_join_free(ij); gm_join_free(ij);
if (listcount(pim_ifp->gm_join_list) < 1) { if (listcount(pim_ifp->gm_join_list) < 1)
list_delete(&pim_ifp->gm_join_list); list_delete(&pim_ifp->gm_join_list);
pim_ifp->gm_join_list = 0;
}
return 0; return 0;
} }