Merge pull request FRRouting#18544 from donaldsharp/memory_leaks_all_over

Memory leaks all over

Author: ton31337

babeld/babel_main.c

@@ -19,6 +19,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek
 #include "memory.h"
 #include "libfrr.h"
 #include "lib_errors.h"
+#include "plist.h"
 
 #include "babel_main.h"
 #include "babeld.h"
@@ -313,6 +314,7 @@ babel_exit_properly(void)
     debugf(BABEL_DEBUG_COMMON, "Done.");
 
     vrf_terminate();
+    prefix_list_reset();
     frr_fini();
 
     exit(0);

bgpd/bgp_fsm.c

@@ -1260,7 +1260,7 @@ void bgp_fsm_change_status(struct peer_connection *connection,
 	/* Transition into Clearing or Deleted must /always/ clear all routes..
 	 * (and must do so before actually changing into Deleted..
 	 */
-	if (status >= Clearing && (peer->established || peer == bgp->peer_self)) {
+	if (status >= Clearing && (peer->established || peer != bgp->peer_self)) {
 		bgp_clear_route_all(peer);
 
 		/* If no route was queued for the clear-node processing,

bgpd/bgp_route.c

@@ -4323,9 +4323,14 @@ static void early_meta_queue_free(struct meta_queue *mq, struct bgp_dest_queue *
 	struct bgp_dest *dest;
 
 	while (!STAILQ_EMPTY(l)) {
+		struct bgp_table *table;
+
 		dest = STAILQ_FIRST(l);
 		STAILQ_REMOVE_HEAD(l, pq);
 		STAILQ_NEXT(dest, pq) = NULL; /* complete unlink */
+
+		table = bgp_dest_table(dest);
+		bgp_table_unlock(table);
 		mq->size--;
 	}
 }
@@ -4336,9 +4341,14 @@ static void other_meta_queue_free(struct meta_queue *mq, struct bgp_dest_queue *
 	struct bgp_dest *dest;
 
 	while (!STAILQ_EMPTY(l)) {
+		struct bgp_table *table;
+
 		dest = STAILQ_FIRST(l);
 		STAILQ_REMOVE_HEAD(l, pq);
 		STAILQ_NEXT(dest, pq) = NULL; /* complete unlink */
+
+		table = bgp_dest_table(dest);
+		bgp_table_unlock(table);
 		mq->size--;
 	}
 }

bgpd/bgp_routemap.c

@@ -2615,6 +2615,9 @@ route_set_aspath_exclude(void *rule, const struct prefix *dummy, void *object)
 		path->attr->aspath =
 			aspath_filter_exclude_acl(new_path,
 						  ase->exclude_aspath_acl);
+	else
+		aspath_free(new_path);
+
 	return RMAP_OKAY;
 }
 

eigrpd/eigrp_main.c

@@ -99,6 +99,8 @@ static void sigint(void)
 	keychain_terminate();
 
 	route_map_finish();
+	prefix_list_reset();
+
 	eigrp_terminate();
 
 	exit(0);

isisd/isis_affinitymap.c

@@ -64,4 +64,8 @@ void isis_affinity_map_init(void)
 	affinity_map_set_update_hook(isis_affinity_map_update);
 }
 
+void isis_affinity_map_terminate(void)
+{
+	affinity_map_terminate();
+}
 #endif /* ifndef FABRICD */

isisd/isis_affinitymap.h

@@ -15,6 +15,7 @@ extern "C" {
 #endif
 
 extern void isis_affinity_map_init(void);
+extern void isis_affinity_map_terminate(void);
 
 #ifdef __cplusplus
 }

isisd/isis_main.c

@@ -109,6 +109,10 @@ static __attribute__((__noreturn__)) void terminate(int i)
 
 	isis_master_terminate();
 	route_map_finish();
+	prefix_list_reset();
+#ifndef FABRICD
+	isis_affinity_map_terminate();
+#endif
 	vrf_terminate();
 
 	frr_fini();

lib/affinitymap.c

@@ -127,3 +127,12 @@ void affinity_map_set_update_hook(void (*func)(const char *affmap_name,
 {
 	affinity_map_master.update_hook = func;
 }
+
+void affinity_map_terminate(void)
+{
+	struct affinity_map *map;
+	struct listnode *node, *nnode;
+
+	for (ALL_LIST_ELEMENTS(affinity_map_master.maps, node, nnode, map))
+		affinity_map_free(map);
+}

lib/affinitymap.h

@@ -71,7 +71,7 @@ void affinity_map_set_update_hook(void (*func)(const char *affmap_name,
 					       uint16_t new_pos));
 
 void affinity_map_init(void);
-
+void affinity_map_terminate(void);
 
 #ifdef __cplusplus
 }

ripd/rip_main.c

@@ -94,6 +94,7 @@ static void sigint(void)
 	rip_zclient_stop();
 
 	route_map_finish();
+	prefix_list_reset();
 
 	keychain_terminate();
 	frr_fini();

zebra/main.c

@@ -247,6 +247,8 @@ void zebra_finalize(struct event *dummy)
 
 	label_manager_terminate();
 
+	affinity_map_terminate();
+
 	ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
 
 	ns_terminate();