From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 26 Jun 2017 17:14:47 +0000 (-0400)
Subject: pimd: Fix crash with ifchannel and upstream
X-Git-Tag: frr-4.0-dev~468^2~32
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9c80de24342da8dd2d1db1b3f0f64f8c26084c00;p=mirror%2Ffrr.git

pimd: Fix crash with ifchannel and upstream

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 922ee647a5..7a1c3e2acd 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -577,6 +577,7 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
 		XFREE(MTYPE_PIM_IFCHANNEL, ch);
 		return NULL;
 	}
+	ch->upstream = up;
 
 	listnode_add_sort(up->ifchannels, ch);