]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: uninitialized memory access fix 2712/head
authorF. Aragon <paco@voltanet.io>
Tue, 24 Jul 2018 16:46:38 +0000 (18:46 +0200)
committerF. Aragon <paco@voltanet.io>
Tue, 24 Jul 2018 21:51:15 +0000 (23:51 +0200)
Signed-off-by: F. Aragon <paco@voltanet.io>
pimd/pim_nht.c

index 78152b266f0fad8fec0e8e75c51ef737097ef32b..7d1940bec1c07c3e4b0978d2b68d5274981133fb 100644 (file)
@@ -430,6 +430,9 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
        if (!pnc || !pnc->nexthop_num || !nexthop)
                return 0;
 
+       memset(&nbrs, 0, sizeof(nbrs));
+       memset(&ifps, 0, sizeof(ifps));
+
        // Current Nexthop is VALID, check to stay on the current path.
        if (nexthop->interface && nexthop->interface->info
            && nexthop->mrib_nexthop_addr.u.prefix4.s_addr
@@ -829,6 +832,9 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                return 0;
        }
 
+       memset(&nbrs, 0, sizeof(nbrs));
+       memset(&ifps, 0, sizeof(ifps));
+
        /*
         * Look up all interfaces and neighbors,
         * store for later usage