Skip to content
Permalink
Browse files

Merge pull request #2850 from patrasar/Fix_2363

Fix pim_mroute_del crash while killing pimd
  • Loading branch information...
donaldsharp committed Aug 22, 2018
2 parents 1f063a6 + e83f3b3 commit 61929aa5f9dbf228bf9e3195bfc23845f831fe8f
Showing with 12 additions and 1 deletion.
  1. +10 −1 pimd/pim_ifchannel.c
  2. +2 −0 pimd/pim_upstream.c
@@ -174,7 +174,16 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
ifchannel list is empty before deleting upstream_del
ref count will take care of it.
*/
pim_upstream_del(pim_ifp->pim, ch->upstream, __PRETTY_FUNCTION__);
if (ch->upstream->ref_count > 0)
pim_upstream_del(pim_ifp->pim, ch->upstream,
__PRETTY_FUNCTION__);

else
zlog_warn("%s: Avoiding deletion of upstream with ref_count %d "
"from ifchannel(%s): %s", __PRETTY_FUNCTION__,
ch->upstream->ref_count, ch->interface->name,
ch->sg_str);

ch->upstream = NULL;

THREAD_OFF(ch->t_ifjoin_expiry_timer);
@@ -167,6 +167,8 @@ struct pim_upstream *pim_upstream_del(struct pim_instance *pim,
up->ref_count, up->flags,
up->channel_oil->oil_ref_count);

assert(up->ref_count > 0);

--up->ref_count;

if (up->ref_count >= 1)

0 comments on commit 61929aa

Please sign in to comment.
You can’t perform that action at this time.