From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeremie.galarneau@efficios.com (=?iso-8859-1?Q?J=E9r=E9mie?= Galarneau) Date: Fri, 20 Sep 2019 17:23:37 -0400 Subject: [lttng-dev] [PATCH lttng-tools] Fix: Close socket handle on error In-Reply-To: <20190920153421.67837-1-jonathan.rajotte-julien@efficios.com> References: <20190920153421.67837-1-jonathan.rajotte-julien@efficios.com> Message-ID: <20190920212337.GB20024@gmail.com> Merged in master and stable-2.11. Thanks! J?r?mie On Fri, Sep 20, 2019 at 11:34:21AM -0400, Jonathan Rajotte wrote: > Fixes coverity #1399739 > > Signed-off-by: Jonathan Rajotte > --- > src/bin/lttng-sessiond/client.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c > index 956dab8c8..870277534 100644 > --- a/src/bin/lttng-sessiond/client.c > +++ b/src/bin/lttng-sessiond/client.c > @@ -1985,8 +1985,11 @@ static int create_client_sock(void) > /* File permission MUST be 660 */ > ret = chmod(config.client_unix_sock_path.value, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); > if (ret < 0) { > - ERR("Set file permissions failed: %s", config.client_unix_sock_path.value); > + ERR("Set file permissions failed: %s", > + config.client_unix_sock_path.value); > PERROR("chmod"); > + (void) lttcomm_close_unix_sock(client_sock); > + ret = -1; > goto end; > } > DBG("Created client socket (fd = %i)", client_sock); > -- > 2.17.1 >