X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=3879c2bbb3bc9c9bda33d47564ee5a9c0ccc0471;hb=809dc2811860434a76e4f10cb9f05d938148090c;hp=419d1af7b3fa1b129689ce89fd2e0cc6ee3e5078;hpb=99497cd03fb27fd2416a88d80292a0cc5647bff2;p=lttng-tools.git

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 419d1af7b..3879c2bbb 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "lttngerr.h"
-#include "libkernelctl.h"
+#include "kernelctl.h"
 #include "kernel-ctl.h"
 
 /*
@@ -587,7 +587,7 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 	fp = fdopen(fd, "r");
 	if (fp == NULL) {
 		perror("kernel tracepoint list fdopen");
-		goto error;
+		goto error_fp;
 	}
 
 	/*
@@ -606,7 +606,8 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 			elist = realloc(elist, nbmem);
 			if (elist == NULL) {
 				perror("realloc list events");
-				goto error;
+				count = -ENOMEM;
+				goto end;
 			}
 		}
 		strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
@@ -615,11 +616,13 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 	}
 
 	*events = elist;
-
 	DBG("Kernel list events done (%zu events)", count);
-
+end:
+	fclose(fp);	/* closes both fp and fd */
 	return count;
 
+error_fp:
+	close(fd);
 error:
 	return -1;
 }