From: Corey Siltala <csiltala@atcorp.com>
Date: Fri, 23 Aug 2024 18:04:26 +0000 (+0000)
Subject: pimd: Fix crash in pimd
X-Git-Tag: docker/10.1.1~15^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F16647%2Fhead;p=mirror%2Ffrr.git

pimd: Fix crash in pimd

ifp->info is not always set in PIM. So add a guard here to stop
it from crashing when addresses are added to a non-PIM enabled interface
and PIM zebra debugging is enabled.

Signed-off-by: Corey Siltala <csiltala@atcorp.com>
(cherry picked from commit 12a783d313fccb0a2793f32be57b687dba736e0d)
---

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 04cd087e6a..e25eafc28e 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -97,7 +97,10 @@ static int pim_zebra_if_address_add(ZAPI_CALLBACK_ARGS)
 
 	if (PIM_DEBUG_ZEBRA) {
 		zlog_debug("%s: %s(%s) connected IP address %pFX flags %u %s",
-			   __func__, c->ifp->name, VRF_LOGNAME(pim_ifp->pim->vrf), p, c->flags,
+			   __func__, c->ifp->name,
+			   (pim_ifp ? VRF_LOGNAME(pim_ifp->pim->vrf)
+				    : "Unknown"),
+			   p, c->flags,
 			   CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)
 				   ? "secondary"
 				   : "primary");