ripd: use correct memory type when freeing BFD profile

Fixes #13415. Signed-off-by: Renato Westphal <[email protected]>
FRRouting · May 3, 2023 · 2da9c4c · 2da9c4c
1 parent bf384bb
commit 2da9c4c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/ripd/rip_bfd.c b/ripd/rip_bfd.c
@@ -13,6 +13,8 @@
 #include "ripd/rip_bfd.h"
 #include "ripd/rip_debug.h"
 
+DEFINE_MTYPE(RIPD, RIP_BFD_PROFILE, "RIP BFD profile name");
+
 extern struct zclient *zclient;
 
 static const char *rip_bfd_interface_profile(struct rip_interface *ri)

diff --git a/ripd/rip_bfd.h b/ripd/rip_bfd.h
@@ -9,6 +9,8 @@
 
 #include "frrevent.h"
 
+DECLARE_MTYPE(RIP_BFD_PROFILE);
+
 struct rip;
 struct rip_interface;
 struct rip_peer;

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
@@ -25,6 +25,7 @@
 #include "zebra/connected.h"
 
 #include "ripd/ripd.h"
+#include "ripd/rip_bfd.h"
 #include "ripd/rip_debug.h"
 #include "ripd/rip_interface.h"
 
@@ -457,7 +458,7 @@ static void rip_interface_reset(struct rip_interface *ri)
 	ri->sent_updates = 0;
 
 	ri->passive = 0;
-	XFREE(MTYPE_TMP, ri->bfd.profile);
+	XFREE(MTYPE_RIP_BFD_PROFILE, ri->bfd.profile);
 
 	rip_interface_clean(ri);
 }

diff --git a/ripd/rip_nb_config.c b/ripd/rip_nb_config.c
@@ -25,8 +25,6 @@
 #include "ripd/rip_interface.h"
 #include "ripd/rip_bfd.h"
 
-DEFINE_MTYPE_STATIC(RIPD, RIP_BFD_PROFILE, "RIP BFD profile name");
-
 /*
  * XPath: /frr-ripd:ripd/instance
  */