From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonathan.rajotte-julien@efficios.com (Jonathan Rajotte Julien)
Date: Tue, 18 Oct 2016 18:13:22 -0400
Subject: [lttng-dev] [PATCH lttng-tools] Fix: save: close fd of
	configuration file
In-Reply-To: <1476828593-8761-1-git-send-email-jonathan.rajotte-julien@efficios.com>
References: <1476828593-8761-1-git-send-email-jonathan.rajotte-julien@efficios.com>
Message-ID: <44dcc94a-bee7-cfd0-1c79-4b2dd3998035@efficios.com>

Hi,

This should be backported to 2.9,2.8,2.7.

Thanks

On 2016-10-18 06:09 PM, Jonathan Rajotte wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
>   src/bin/lttng-sessiond/save.c      | 7 +++++++
>   src/common/config/session-config.h | 4 ++--
>   2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
> index 9ac7712..1a879b2 100644
> --- a/src/bin/lttng-sessiond/save.c
> +++ b/src/bin/lttng-sessiond/save.c
> @@ -2053,6 +2053,13 @@ end:
>   		}
>   	}
>   
> +	if (file_opened) {
> +		ret = close(fd);
> +		if (ret) {
> +			PERROR("Closing XML session configuration");
> +		}
> +	}
> +
>   	return ret;
>   }
>   
> diff --git a/src/common/config/session-config.h b/src/common/config/session-config.h
> index c6439f7..f48ff74 100644
> --- a/src/common/config/session-config.h
> +++ b/src/common/config/session-config.h
> @@ -85,8 +85,8 @@ int config_parse_value(const char *value);
>   /*
>    * Create an instance of a configuration writer.
>    *
> - * fd_output File to which the XML content must be written. The file will be
> - * closed once the config_writer has been destroyed.
> + * fd_output File to which the XML content must be written. fd_output is
> + * owned by the caller.
>    *
>    * indent If other than 0 the XML will be pretty printed
>    * with indentation and newline.

-- 
Jonathan R. Julien
Efficios