From: David Goulet <dgoulet@efficios.com>
Date: Fri, 26 Oct 2012 17:04:27 +0000 (-0400)
Subject: Fix: relayd memleaks
X-Git-Tag: v2.1.0-rc6~14
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5b6d8097dcb979a1e10b5fea7b8dd7a2f1498fe0;p=lttng-tools.git

Fix: relayd memleaks

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index c09c0c525..152e4bbc8 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -884,7 +884,8 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 	}
 
 	DBG("Relay deleting session %" PRIu64, cmd->session->id);
-	free(cmd->session->sock);
+
+	lttcomm_destroy_sock(cmd->session->sock);
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(streams_ht->ht, &iter.iter, node, node) {
@@ -902,6 +903,8 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 		}
 	}
 	rcu_read_unlock();
+
+	free(cmd->session);
 }
 
 /*
@@ -1599,6 +1602,8 @@ void deferred_free_connection(struct rcu_head *head)
 {
 	struct relay_command *relay_connection =
 		caa_container_of(head, struct relay_command, rcu_node);
+
+	lttcomm_destroy_sock(relay_connection->sock);
 	free(relay_connection);
 }
 
@@ -1614,6 +1619,7 @@ void relay_del_connection(struct lttng_ht *relay_connections_ht,
 	if (relay_connection->type == RELAY_CONTROL) {
 		relay_delete_session(relay_connection, streams_ht);
 	}
+
 	call_rcu(&relay_connection->rcu_node,
 		deferred_free_connection);
 }