From a76cbd9f0350826e05c238b73425ff4e5825cc96 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 9 Jul 2013 12:28:41 -0400 Subject: [PATCH] Fix: possible consumer sockets double close on cleanup Signed-off-by: David Goulet --- src/bin/lttng-sessiond/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index a117a1f1c..91e085290 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"); } } } @@ -1149,12 +1149,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); -- 2.34.1