From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 26 May 2017 16:14:19 +0000 (+0200)
Subject: Fix: lttng list of channels should return errors
X-Git-Tag: v2.11.0-rc1~528
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d449df4a0c50d0d29ebf66d46c6005e241241346;p=lttng-tools.git

Fix: lttng list of channels should return errors

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index c4e4ccfbe..9e761958a 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -243,11 +243,11 @@ end:
 /*
  * Fill lttng_channel array of all channels.
  */
-static void list_lttng_channels(enum lttng_domain_type domain,
+static ssize_t list_lttng_channels(enum lttng_domain_type domain,
 		struct ltt_session *session, struct lttng_channel *channels,
 		struct lttng_channel_extended *chan_exts)
 {
-	int i = 0, ret;
+	int i = 0, ret = 0;
 	struct ltt_kernel_channel *kchan;
 
 	DBG("Listing channels for session %s", session->name);
@@ -322,6 +322,9 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 				break;
 			}
 
+			chan_exts[i].monitor_timer_interval =
+					uchan->monitor_timer_interval;
+
 			ret = get_ust_runtime_stats(session, uchan,
 					&discarded_events, &lost_packets);
 			if (ret < 0) {
@@ -329,8 +332,6 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			}
 			chan_exts[i].discarded_events = discarded_events;
 			chan_exts[i].lost_packets = lost_packets;
-			chan_exts[i].monitor_timer_interval =
-					uchan->monitor_timer_interval;
 			i++;
 		}
 		rcu_read_unlock();
@@ -341,7 +342,11 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 	}
 
 end:
-	return;
+	if (ret < 0) {
+		return -LTTNG_ERR_FATAL;
+	} else {
+		return LTTNG_OK;
+	}
 }
 
 static void increment_extended_len(const char *filter_expression,
@@ -2936,7 +2941,12 @@ ssize_t cmd_list_channels(enum lttng_domain_type domain,
 
 		channel_exts = ((void *) *channels) +
 				(nb_chan * sizeof(struct lttng_channel));
-		list_lttng_channels(domain, session, *channels, channel_exts);
+		ret = list_lttng_channels(domain, session, *channels, channel_exts);
+		if (ret != LTTNG_OK) {
+			free(*channels);
+			*channels = NULL;
+			goto end;
+		}
 	} else {
 		*channels = NULL;
 	}