From da55afba150315e38aabe15a1f1340fa121db072 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 24 Aug 2016 16:09:28 -0400 Subject: [PATCH] pimd: Another null pointer dereference When starting up with a large # of streams it is possible to have a timing where we do not yet have a pim_ifp. Ticket: CM-12636 Signed-off-by: Donald Sharp --- pimd/pim_upstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 5c142a1674..0f86e8bdfd 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -1070,7 +1070,7 @@ pim_upstream_inherited_olist (struct pim_upstream *up) int output_intf = 0; pim_ifp = up->rpf.source_nexthop.interface->info; - if (!up->channel_oil) + if (pim_ifp && !up->channel_oil) up->channel_oil = pim_channel_oil_add (&up->sg, pim_ifp->mroute_vif_index); for (ALL_LIST_ELEMENTS (vrf_iflist (VRF_DEFAULT), ifnode, ifnextnode, ifp)) -- 2.39.5