From: David Goulet <dgoulet@efficios.com>
Date: Tue, 9 Jul 2013 16:28:41 +0000 (-0400)
Subject: Fix: possible consumer sockets double close on cleanup
X-Git-Tag: v2.2.1~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=073fffee48e14453d103546048ebb77c80a831f8;p=lttng-tools.git

Fix: possible consumer sockets double close on cleanup

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7da7faba0..acdddffdb 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -406,13 +406,13 @@ static void close_consumer_sockets(void)
 	if (ustconsumer32_data.err_sock >= 0) {
 		ret = close(ustconsumer32_data.err_sock);
 		if (ret < 0) {
-			PERROR("UST consumer32 err_sock close");
+			PERROR("UST consumerd32 err_sock close");
 		}
 	}
 	if (ustconsumer64_data.err_sock >= 0) {
 		ret = close(ustconsumer64_data.err_sock);
 		if (ret < 0) {
-			PERROR("UST consumer64 err_sock close");
+			PERROR("UST consumerd64 err_sock close");
 		}
 	}
 	if (kconsumer_data.cmd_sock >= 0) {
@@ -424,13 +424,13 @@ static void close_consumer_sockets(void)
 	if (ustconsumer32_data.cmd_sock >= 0) {
 		ret = close(ustconsumer32_data.cmd_sock);
 		if (ret < 0) {
-			PERROR("UST consumer32 cmd_sock close");
+			PERROR("UST consumerd32 cmd_sock close");
 		}
 	}
 	if (ustconsumer64_data.cmd_sock >= 0) {
 		ret = close(ustconsumer64_data.cmd_sock);
 		if (ret < 0) {
-			PERROR("UST consumer64 cmd_sock close");
+			PERROR("UST consumerd64 cmd_sock close");
 		}
 	}
 }
@@ -1148,12 +1148,14 @@ error:
 		if (ret) {
 			PERROR("close");
 		}
+		consumer_data->err_sock = -1;
 	}
 	if (consumer_data->cmd_sock >= 0) {
 		ret = close(consumer_data->cmd_sock);
 		if (ret) {
 			PERROR("close");
 		}
+		consumer_data->cmd_sock = -1;
 	}
 	if (consumer_data->metadata_sock.fd >= 0) {
 		ret = close(consumer_data->metadata_sock.fd);