]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: Fix crash in pimd
authorCorey Siltala <csiltala@atcorp.com>
Fri, 23 Aug 2024 18:04:26 +0000 (18:04 +0000)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Sat, 24 Aug 2024 08:13:28 +0000 (08:13 +0000)
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)

pimd/pim_zebra.c

index 04cd087e6a07d0f9713f9afbb777dcf2faea6b05..e25eafc28e7859abfd17a02cbe7d0b199d77c433 100644 (file)
@@ -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");