X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fchannel.c;h=9fd98b82d2d691625b5c55f0b587392d938e976b;hp=2dd9840d4083e864230d87235eb9e01752f4cc68;hb=ff4d74e67c570a1419df7315453a60e9d1f16a7d;hpb=b0a40d28e4498724b405cbcd5c468bfec3295eb0

diff --git a/lttng-sessiond/channel.c b/lttng-sessiond/channel.c
index 2dd9840d4..9fd98b82d 100644
--- a/lttng-sessiond/channel.c
+++ b/lttng-sessiond/channel.c
@@ -161,19 +161,19 @@ error:
  * Create kernel channel of the kernel session and notify kernel thread.
  */
 int channel_kernel_create(struct ltt_kernel_session *ksession,
-		struct lttng_channel *chan, int kernel_pipe)
+		struct lttng_channel *attr, int kernel_pipe)
 {
 	int ret;
-	struct lttng_channel *attr = chan;
+	struct lttng_channel *defattr = NULL;
 
 	/* Creating channel attributes if needed */
 	if (attr == NULL) {
-		/* FIXME: this appears to be a memory leak */
-		attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
-		if (attr == NULL) {
+		defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
+		if (defattr == NULL) {
 			ret = LTTCOMM_FATAL;
 			goto error;
 		}
+		attr = defattr;
 	}
 
 	/* Channel not found, creating it */
@@ -191,8 +191,8 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 	}
 
 	ret = LTTCOMM_OK;
-
 error:
+	free(defattr);
 	return ret;
 }