From: anuradhak <anuradhak@cumulusnetworks.com>
Date: Tue, 29 Nov 2016 00:22:28 +0000 (-0800)
Subject: pim-msdp: Fix pimd crash on mesh-group delete.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~62
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b9b1e1f2bab7339fa9d761565cc9f21289a5b63c;p=mirror%2Ffrr.git

pim-msdp: Fix pimd crash on mesh-group delete.

The mesh group contents were being accessed after memory was freed.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
---

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 0c5b1c7f2e..3562a0e348 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -1185,10 +1185,11 @@ pim_msdp_mg_free(struct pim_msdp_mg *mg)
   }
   if (mg->mesh_group_name)
     XFREE(MTYPE_PIM_MSDP_MG_NAME, mg->mesh_group_name);
-  XFREE(MTYPE_PIM_MSDP_MG, mg);
 
   if (mg->mbr_list)
     list_free(mg->mbr_list);
+
+  XFREE(MTYPE_PIM_MSDP_MG, mg);
   msdp->mg = NULL;
 }