X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fregister.c;h=ecb0dfef07457e1ca68aa76d749ed9981cbf4c10;hb=0f68efb616cd046543e5fc5a091466ec26df2216;hp=6ce25ad0f66a1f9af143b73e3937693d444bf334;hpb=21fa020ee12d44632c5efde063869d542897bdd1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/register.c b/src/bin/lttng-sessiond/register.c
index 6ce25ad0f..ecb0dfef0 100644
--- a/src/bin/lttng-sessiond/register.c
+++ b/src/bin/lttng-sessiond/register.c
@@ -72,7 +72,7 @@ static int create_application_socket(void)
 	if (ret < 0) {
 		PERROR("Set file permissions failed on %s",
 				config.apps_unix_sock_path.value);
-		goto end;
+		goto error_close_socket;
 	}
 
 	DBG3("Session daemon application socket created (fd = %d) ", apps_sock);
@@ -80,6 +80,13 @@ static int create_application_socket(void)
 end:
 	umask(old_umask);
 	return ret;
+error_close_socket:
+	if (close(apps_sock)) {
+		PERROR("Failed to close application socket in error path");
+	}
+	apps_sock = -1;
+	ret = -1;
+	goto end;
 }
 
 /*
@@ -239,11 +246,6 @@ static void *thread_application_registration(void *data)
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
-			if (!revents) {
-				/* No activity for this FD (poll implementation). */
-				continue;
-			}
-
 			/* Thread quit pipe has been closed. Killing thread. */
 			if (pollfd == quit_pipe_read_fd) {
 				err = 0;