From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 7 Feb 2014 16:54:06 +0000 (-0500)
Subject: Fix: FD leak in liblttng-ust-ctl
X-Git-Tag: v2.4.0-rc4~6
X-Git-Url: https://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=b24e4e91830659fca70cfd4381280b828bf8d360

Fix: FD leak in liblttng-ust-ctl

Make sure wait/wakeup stream and channel FDs are closed at teardown.
This led to FD leaks on the consumer daemon when the relay daemon
disconnects unexpectedly.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 00d9802e..bc3ea9b1 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -1012,6 +1012,8 @@ chan_error:
 
 void ustctl_destroy_channel(struct ustctl_consumer_channel *chan)
 {
+	(void) ustctl_channel_close_wait_fd(chan);
+	(void) ustctl_channel_close_wakeup_fd(chan);
 	chan->chan->ops->channel_destroy(chan->chan);
 	free(chan);
 }
@@ -1220,6 +1222,8 @@ void ustctl_destroy_stream(struct ustctl_consumer_stream *stream)
 	assert(stream);
 	buf = stream->buf;
 	consumer_chan = stream->chan;
+	(void) ustctl_stream_close_wait_fd(stream);
+	(void) ustctl_stream_close_wakeup_fd(stream);
 	lib_ring_buffer_release_read(buf, consumer_chan->chan->handle);
 	free(stream);
 }