pimd: Fix for crash during networking restart

During vrf delete, the vxlan_info.work_list
linked list was deleted which is a global list
containing the SGs for all the VRFs.

If two vrfs are configured, vrf a and vrf b and
both has SGs assocaited with them which are
inserted in the vxlan_info.work_list. Now if
vrf a is deleted, it deletes the work_list also.
Due to this when any SG add or del comes for vrf b
it tries to access the work_list and crashes.

Fix
Delete the vxlan_info.work_list only when all the
VRFs are terminated and unset the vxlan_info.flags
so if new add cmd comes it re-allocates the work_list.

Signed-off-by: usrivastava-nvidia <usrivastava@nvidia.com>
(cherry picked from commit b88cce233043806129eb6d8c938655b2886ec898)

diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 535bcf8b8c5e3dcf854e1a88638276d20754bfd4..0f0021498347efe7184186baae5db1c5e933854c 100644 (file)
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -276,4 +276,6 @@ void pim_vrf_terminate(void)
        }
 
        vrf_terminate();
+       /* Delete the vxlan_info.work_list as all the VRFs are deleted*/
+       pim_vxlan_work_list_delete();
 }

diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index f1f315cc98100531d61d59b54524847323795e79..9d5f8c1d6ccdc75d3bb24742bce5ce16fd151f37 100644 (file)
--- a/pimd/pim_vxlan.c
+++ b/pimd/pim_vxlan.c
@@ -1250,9 +1250,14 @@ void pim_vxlan_exit(struct pim_instance *pim)
 {
        hash_clean_and_free(&pim->vxlan.sg_hash,
                            (void (*)(void *))pim_vxlan_sg_del_item);
+}
 
-       if (vxlan_info.work_list)
+void pim_vxlan_work_list_delete(void)
+{
+       if (vxlan_info.work_list) {
                list_delete(&vxlan_info.work_list);
+               UNSET_FLAG(vxlan_info.flags, PIM_VXLANF_WORK_INITED);
+       }
 }
 
 void pim_vxlan_terminate(void)

diff --git a/pimd/pim_vxlan_instance.h b/pimd/pim_vxlan_instance.h
index 65a5955851f632a2cabc63ecb32d3c72e9734c16..839397b1b744c85a45ecb83630818d15b3254a70 100644 (file)
--- a/pimd/pim_vxlan_instance.h
+++ b/pimd/pim_vxlan_instance.h
@@ -33,5 +33,6 @@ struct pim_vxlan_instance {
 
 extern void pim_vxlan_init(struct pim_instance *pim);
 extern void pim_vxlan_exit(struct pim_instance *pim);
+void pim_vxlan_work_list_delete(void);
 
 #endif /* PIM_VXLAN_INSTANCE_H */