*: modify VRF_CONFIGURED flag only in VRF NB layer

This is to fix the crash reproduced by the following steps:

* ip link add red type vrf table 1

  Creates VRF.

* vtysh -c "conf" -c "vrf red"

  Creates VRF NB node and marks VRF as configured.

* ip route 1.1.1.0/24 2.2.2.2 vrf red
* no ip route 1.1.1.0/24 2.2.2.2 vrf red
  (or similar l3vni set/unset in zebra)

  Marks VRF as NOT configured.

* ip link del red

  VRF is deleted, because it is marked as not configured, but NB node
  stays.

Subsequent attempt to configure something in the VRF leads to a crash
because of the stale pointer in NB layer.

Fixes #8357.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/lib/vrf.c b/lib/vrf.c
index dff041cbc77a3e5c95e78f8dfd18e204a0ee824d..7888d435f5b058c8fd4060d86f6889ba74cf08fa 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -1110,7 +1110,7 @@ static int lib_vrf_create(struct nb_cb_create_args *args)
 
        vrfp = vrf_get(VRF_UNKNOWN, vrfname);
 
-       vrf_set_user_cfged(vrfp);
+       SET_FLAG(vrfp->status, VRF_CONFIGURED);
        nb_running_set_entry(args->dnode, vrfp);
 
        return NB_OK;
@@ -1136,7 +1136,7 @@ static int lib_vrf_destroy(struct nb_cb_destroy_args *args)
                vrfp = nb_running_unset_entry(args->dnode);
 
                /* Clear configured flag and invoke delete. */
-               vrf_reset_user_cfged(vrfp);
+               UNSET_FLAG(vrfp->status, VRF_CONFIGURED);
                vrf_delete(vrfp);
                break;
        }

diff --git a/lib/vrf.h b/lib/vrf.h
index 6cdb52244dcd9a0992b5847809950b9bcf052f60..c79dd99b9a282da30db515337846a02ee8db0304 100644 (file)
--- a/lib/vrf.h
+++ b/lib/vrf.h
@@ -159,18 +159,6 @@ static inline int vrf_is_user_cfged(struct vrf *vrf)
        return vrf && CHECK_FLAG(vrf->status, VRF_CONFIGURED);
 }
 
-/* Mark that VRF has user configuration */
-static inline void vrf_set_user_cfged(struct vrf *vrf)
-{
-       SET_FLAG(vrf->status, VRF_CONFIGURED);
-}
-
-/* Mark that VRF no longer has any user configuration */
-static inline void vrf_reset_user_cfged(struct vrf *vrf)
-{
-       UNSET_FLAG(vrf->status, VRF_CONFIGURED);
-}
-
 static inline uint32_t vrf_interface_count(struct vrf *vrf)
 {
        uint32_t count = 0;

diff --git a/staticd/static_routes.c b/staticd/static_routes.c
index 739c08b09ebcac108046d6b3b8e375a3ddd3017c..cdafc4a76a39abd7bc064f88e44a5abdd7825fb9 100644 (file)
--- a/staticd/static_routes.c
+++ b/staticd/static_routes.c
@@ -139,9 +139,6 @@ struct route_node *static_add_route(afi_t afi, safi_t safi, struct prefix *p,
 
        rn->info = si;
 
-       /* Mark as having FRR configuration */
-       vrf_set_user_cfged(svrf->vrf);
-
        return rn;
 }
 
@@ -160,9 +157,6 @@ static void static_del_src_route(struct route_node *rn, safi_t safi,
 
        XFREE(MTYPE_STATIC_ROUTE, rn->info);
        route_unlock_node(rn);
-       /* If no other FRR config for this VRF, mark accordingly. */
-       if (!static_vrf_has_config(svrf))
-               vrf_reset_user_cfged(svrf->vrf);
 }
 
 void static_del_route(struct route_node *rn, safi_t safi,
@@ -192,9 +186,6 @@ void static_del_route(struct route_node *rn, safi_t safi,
        }
        XFREE(MTYPE_STATIC_ROUTE, rn->info);
        route_unlock_node(rn);
-       /* If no other FRR config for this VRF, mark accordingly. */
-       if (!static_vrf_has_config(svrf))
-               vrf_reset_user_cfged(svrf->vrf);
 }
 
 bool static_add_nexthop_validate(const char *nh_vrf_name, static_types type,

diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c
index ba1367b877f4175dc553e61ffc64f08b4693de23..96e5d37d68d91221c4e4e904c337fa50b4bb43b3 100644 (file)
--- a/staticd/static_vrf.c
+++ b/staticd/static_vrf.c
@@ -170,27 +170,6 @@ static int static_vrf_config_write(struct vty *vty)
        return 0;
 }
 
-int static_vrf_has_config(struct static_vrf *svrf)
-{
-       struct route_table *table;
-       safi_t safi;
-       afi_t afi;
-
-       /*
-        * NOTE: This is a don't care for the default VRF, but we go through
-        * the motions to keep things consistent.
-        */
-       FOREACH_AFI_SAFI (afi, safi) {
-               table = svrf->stable[afi][safi];
-               if (!table)
-                       continue;
-               if (route_table_count(table))
-                       return 1;
-       }
-
-       return 0;
-}
-
 void static_vrf_init(void)
 {
        vrf_init(static_vrf_new, static_vrf_enable,

diff --git a/staticd/static_vrf.h b/staticd/static_vrf.h
index 81296f286463351e7ce6ca65239532d6f310a709..3977899054a061d0a6d114f1232d60a5dc170f7e 100644 (file)
--- a/staticd/static_vrf.h
+++ b/staticd/static_vrf.h
@@ -37,8 +37,6 @@ struct stable_info {
 struct static_vrf *static_vrf_lookup_by_name(const char *vrf_name);
 struct static_vrf *static_vrf_lookup_by_id(vrf_id_t vrf_id);
 
-int static_vrf_has_config(struct static_vrf *svrf);
-
 void static_vrf_init(void);
 
 struct route_table *static_vrf_static_table(afi_t afi, safi_t safi,

diff --git a/zebra/zebra_nb_config.c b/zebra/zebra_nb_config.c
index ba9f96b7dee8d84065f78b21ab509f2d0e5f5c18..142c53b833037acfc4516b64fba06c223267f9a6 100644 (file)
--- a/zebra/zebra_nb_config.c
+++ b/zebra/zebra_nb_config.c
@@ -1218,9 +1218,6 @@ int lib_vrf_zebra_l3vni_id_modify(struct nb_cb_modify_args *args)
                        return NB_ERR;
                }
 
-               /* Mark as having FRR configuration */
-               vrf_set_user_cfged(vrf);
-
                break;
        }
 
@@ -1268,10 +1265,6 @@ int lib_vrf_zebra_l3vni_id_destroy(struct nb_cb_destroy_args *args)
                        return NB_ERR;
                }
 
-               /* If no other FRR config for this VRF, mark accordingly. */
-               if (!zebra_vrf_has_config(zvrf))
-                       vrf_reset_user_cfged(vrf);
-
                break;
        }
 

diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c
index b42923640f27e684b1d6ae569a35e494f06de31f..212557423b8c4548480a809526067943c4d2a654 100644 (file)
--- a/zebra/zebra_vrf.c
+++ b/zebra/zebra_vrf.c
@@ -338,20 +338,6 @@ static int zebra_vrf_update(struct vrf *vrf)
        return 0;
 }
 
-
-/* Return if this VRF has any FRR configuration or not.
- * IMPORTANT: This function needs to be updated when additional configuration
- * is added for a VRF.
- */
-int zebra_vrf_has_config(struct zebra_vrf *zvrf)
-{
-       /* EVPN L3-VNI? */
-       if (zvrf->l3vni)
-               return 1;
-
-       return 0;
-}
-
 /* Lookup the routing table in a VRF based on both VRF-Id and table-id.
  * NOTE: Table-id is relevant on two modes:
  * - case VRF backend is default : on default VRF only

diff --git a/zebra/zebra_vrf.h b/zebra/zebra_vrf.h
index ed6376b01f14072211b41a028e83213e04ad999f..000b5a723825dd68cd262fd4b3e1bb05aa3ecc7e 100644 (file)
--- a/zebra/zebra_vrf.h
+++ b/zebra/zebra_vrf.h
@@ -254,7 +254,6 @@ extern struct zebra_vrf *zebra_vrf_lookup_by_name(const char *);
 extern struct zebra_vrf *zebra_vrf_alloc(void);
 extern struct route_table *zebra_vrf_table(afi_t, safi_t, vrf_id_t);
 
-extern int zebra_vrf_has_config(struct zebra_vrf *zvrf);
 extern void zebra_vrf_init(void);
 
 extern void zebra_rtable_node_cleanup(struct route_table *table,