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

Merge pull request #17635 from opensourcerouting/pim6-embedded-crash

Browse Source 
pim6d: fix crash on clear ipv6 mroute
This commit is contained in:
Jafar Al-Gharaibeh 2024-12-13 09:36:28 -06:00 committed by GitHub
commit 330e2c68e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim6_mld.c
View File

@ -449,7 +449,7 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired)
* this data structure. * this data structure.
*/ */
if (sg->oil) if (sg->oil)
pim_channel_oil_del(sg->oil, __func__); sg->oil = pim_channel_oil_del(sg->oil, __func__);
/* multiple paths can lead to the last state going away; /* multiple paths can lead to the last state going away;
* t_sg_expire can still be running if we're arriving from * t_sg_expire can still be running if we're arriving from

7
pimd/pim_tib.c
View File

@ -115,13 +115,8 @@ bool tib_sg_gm_join(struct pim_instance *pim, pim_sgaddr sg,
return false; return false;
} }
if (!*oilp) { if (!*oilp)
*oilp = tib_sg_oil_setup(pim, sg, oif); *oilp = tib_sg_oil_setup(pim, sg, oif);
#if PIM_IPV == 6
if (pim_embedded_rp_is_embedded(&sg.grp))
(*oilp)->oil_ref_count--;
#endif /* PIM_IPV == 6 */
}
if (!*oilp) if (!*oilp)
return false; return false;