proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-25 22:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14338 from FRRouting/mergify/bp/stable/8.5/pr-14294

Browse Source 
pimd: Prevent crash when receiving register message when the RP() is … (backport #14294)
This commit is contained in:
Jafar Al-Gharaibeh 2023-09-01 22:19:09 -05:00 committed by GitHub
commit b798bfefb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pimd/pim_register.c
View File

@ -507,6 +507,7 @@ int pim_register_recv(struct interface *ifp, pim_addr dest_addr,
struct pim_interface *pim_ifp = ifp->info; struct pim_interface *pim_ifp = ifp->info;
struct pim_instance *pim = pim_ifp->pim; struct pim_instance *pim = pim_ifp->pim;
pim_addr rp_addr; pim_addr rp_addr;
struct pim_rpf *rpg;
if (pim_ifp->pim_passive_enable) { if (pim_ifp->pim_passive_enable) {
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
@ -615,7 +616,14 @@ int pim_register_recv(struct interface *ifp, pim_addr dest_addr,
} }
} }
rp_addr = (RP(pim, sg.grp))->rpf_addr; rpg = RP(pim, sg.grp);
if (!rpg) {
zlog_warn("%s: Received Register Message %pSG from %pPA on %s where the RP could not be looked up",
__func__, &sg, &src_addr, ifp->name);
return 0;
}
rp_addr = rpg->rpf_addr;
if (i_am_rp && (!pim_addr_cmp(dest_addr, rp_addr))) { if (i_am_rp && (!pim_addr_cmp(dest_addr, rp_addr))) {
sentRegisterStop = 0; sentRegisterStop = 0;