bgpd: delete_vin_type2_route may free dest

The dest pointer may be freed( but should not be
due to locking ).  Let's ensure that this assumption
is true and make coverity happy.

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

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 6cc1dd710d74abc098a634d3b0b57b57de53a8a0..9bc6c508dc12253510537dd81d7fa86b3f5df45f 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -2578,7 +2578,8 @@ static void delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
        }
 }
 
-static void delete_vni_type2_route(struct bgp *bgp, struct bgp_dest *dest)
+static struct bgp_dest *delete_vni_type2_route(struct bgp *bgp,
+                                              struct bgp_dest *dest)
 {
        struct bgp_path_info *pi;
        afi_t afi = AFI_L2VPN;
@@ -2588,13 +2589,15 @@ static void delete_vni_type2_route(struct bgp *bgp, struct bgp_dest *dest)
                (const struct prefix_evpn *)bgp_dest_get_prefix(dest);
 
        if (evp->prefix.route_type != BGP_EVPN_MAC_IP_ROUTE)
-               return;
+               return dest;
 
        delete_evpn_route_entry(bgp, afi, safi, dest, &pi);
 
        /* Route entry in local table gets deleted immediately. */
        if (pi)
-               bgp_path_info_reap(dest, pi);
+               dest = bgp_path_info_reap(dest, pi);
+
+       return dest;
 }
 
 static void delete_vni_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
@@ -2605,12 +2608,16 @@ static void delete_vni_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
         * routes.
         */
        for (dest = bgp_table_top(vpn->mac_table); dest;
-            dest = bgp_route_next(dest))
-               delete_vni_type2_route(bgp, dest);
+            dest = bgp_route_next(dest)) {
+               dest = delete_vni_type2_route(bgp, dest);
+               assert(dest);
+       }
 
        for (dest = bgp_table_top(vpn->ip_table); dest;
-            dest = bgp_route_next(dest))
-               delete_vni_type2_route(bgp, dest);
+            dest = bgp_route_next(dest)) {
+               dest = delete_vni_type2_route(bgp, dest);
+               assert(dest);
+       }
 }
 
 /*