projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: leak of application socket on chmod failure
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
register.c
diff --git
a/src/bin/lttng-sessiond/register.c
b/src/bin/lttng-sessiond/register.c
index d0a1ff14a69dc3173d89fbcf866de09fdb339816..ecb0dfef07457e1ca68aa76d749ed9981cbf4c10 100644
(file)
--- 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);
if (ret < 0) {
PERROR("Set file permissions failed on %s",
config.apps_unix_sock_path.value);
- goto e
nd
;
+ goto e
rror_close_socket
;
}
DBG3("Session daemon application socket created (fd = %d) ", apps_sock);
}
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;
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);
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;
/* Thread quit pipe has been closed. Killing thread. */
if (pollfd == quit_pipe_read_fd) {
err = 0;
@@
-400,13
+402,12
@@
struct lttng_thread *launch_application_registration_thread(
struct thread_notifiers *notifiers = NULL;
struct lttng_thread *thread;
struct thread_notifiers *notifiers = NULL;
struct lttng_thread *thread;
- quit_pipe = lttng_pipe_open(FD_CLOEXEC);
- if (!quit_pipe) {
- goto error;
- }
-
notifiers = zmalloc(sizeof(*notifiers));
if (!notifiers) {
notifiers = zmalloc(sizeof(*notifiers));
if (!notifiers) {
+ goto error_alloc;
+ }
+ quit_pipe = lttng_pipe_open(FD_CLOEXEC);
+ if (!quit_pipe) {
goto error;
}
notifiers->quit_pipe = quit_pipe;
goto error;
}
notifiers->quit_pipe = quit_pipe;
@@
-428,5
+429,6
@@
struct lttng_thread *launch_application_registration_thread(
return thread;
error:
cleanup_application_registration_thread(notifiers);
return thread;
error:
cleanup_application_registration_thread(notifiers);
+error_alloc:
return NULL;
}
return NULL;
}
This page took
0.023879 seconds
and
4
git commands to generate.