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

pimd: ch->upstream cannot be NULL

Browse Source 
in pim_ifchannel.c there exists several spots where
the ch->upstream is assumed to be NULL.  This is not
possible.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-08-15 11:39:14 -04:00
parent 7fc3f834e9
commit 29b458ef1f
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pimd/pim_ifchannel.c
View File

@ -539,10 +539,7 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, pim_sgaddr *sg,
if (up_flags == PIM_UPSTREAM_FLAG_MASK_SRC_IGMP) if (up_flags == PIM_UPSTREAM_FLAG_MASK_SRC_IGMP)
PIM_IF_FLAG_SET_PROTO_IGMP(ch->flags); PIM_IF_FLAG_SET_PROTO_IGMP(ch->flags);
if (ch->upstream) ch->upstream->flags |= up_flags;
ch->upstream->flags |= up_flags;
else if (PIM_DEBUG_EVENTS)
zlog_debug("%s:%pSG No Upstream found", __func__, sg);
return ch; return ch;
} }
@ -637,8 +634,7 @@ static void ifjoin_to_noinfo(struct pim_ifchannel *ch)
pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO); pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO);
pim_forward_stop(ch); pim_forward_stop(ch);
if (ch->upstream) PIM_UPSTREAM_FLAG_UNSET_SRC_PIM(ch->upstream->flags);
PIM_UPSTREAM_FLAG_UNSET_SRC_PIM(ch->upstream->flags);
PIM_IF_FLAG_UNSET_PROTO_PIM(ch->flags); PIM_IF_FLAG_UNSET_PROTO_PIM(ch->flags);
@ -696,31 +692,29 @@ static void on_ifjoin_prune_pending_timer(struct thread *t)
* message on RP path upon prune timer expiry. * message on RP path upon prune timer expiry.
*/ */
ch->ifjoin_state = PIM_IFJOIN_PRUNE; ch->ifjoin_state = PIM_IFJOIN_PRUNE;
if (ch->upstream) { struct pim_upstream *parent =
struct pim_upstream *parent = ch->upstream->parent;
ch->upstream->parent;
pim_upstream_update_join_desired(pim_ifp->pim, pim_upstream_update_join_desired(pim_ifp->pim,
ch->upstream); ch->upstream);
pim_jp_agg_single_upstream_send(&parent->rpf, pim_jp_agg_single_upstream_send(&parent->rpf,
parent, true); parent, true);
/* /*
* SGRpt prune pending expiry has to install * SGRpt prune pending expiry has to install
* SG entry with empty olist to drop the SG * SG entry with empty olist to drop the SG
* traffic incase no other intf exists. * traffic incase no other intf exists.
* On that scenario, SG entry wouldn't have * On that scenario, SG entry wouldn't have
* got installed until Prune pending timer * got installed until Prune pending timer
* expired. So install now. * expired. So install now.
*/ */
pim_channel_del_oif( pim_channel_del_oif(
ch->upstream->channel_oil, ifp, ch->upstream->channel_oil, ifp,
PIM_OIF_FLAG_PROTO_STAR, __func__); PIM_OIF_FLAG_PROTO_STAR, __func__);
if (!ch->upstream->channel_oil->installed) if (!ch->upstream->channel_oil->installed)
pim_upstream_mroute_add( pim_upstream_mroute_add(
ch->upstream->channel_oil, ch->upstream->channel_oil,
__func__); __func__);
}
} }
/* from here ch may have been deleted */ /* from here ch may have been deleted */
} }