The client socket is not created by the session daemon's main thread
which causes calls to umask() to be issued from multiple threads.
Since umask manipulates a process-wide ressource, it should be only be
used by a single thread.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
static struct thread_state {
sem_t ready;
bool running;
static struct thread_state {
sem_t ready;
bool running;
} thread_state;
static void set_thread_status(bool running)
} thread_state;
static void set_thread_status(bool running)
uint32_t revents, nb_fd;
struct command_ctx *cmd_ctx = NULL;
struct lttng_poll_event events;
uint32_t revents, nb_fd;
struct command_ctx *cmd_ctx = NULL;
struct lttng_poll_event events;
+ const int client_sock = thread_state.client_sock;
struct lttng_pipe *quit_pipe = data;
const int thread_quit_pipe_fd = lttng_pipe_get_readfd(quit_pipe);
struct lttng_pipe *quit_pipe = data;
const int thread_quit_pipe_fd = lttng_pipe_get_readfd(quit_pipe);
is_root = (getuid() == 0);
pthread_cleanup_push(thread_init_cleanup, NULL);
is_root = (getuid() == 0);
pthread_cleanup_push(thread_init_cleanup, NULL);
- client_sock = create_client_sock();
- if (client_sock < 0) {
- goto error_listen;
- }
error_listen:
error_create_poll:
unlink(config.client_unix_sock_path.value);
error_listen:
error_create_poll:
unlink(config.client_unix_sock_path.value);
- if (client_sock >= 0) {
- ret = close(client_sock);
- if (ret) {
- PERROR("close");
- }
+ ret = close(client_sock);
+ if (ret) {
+ PERROR("close");
{
bool thread_running;
struct lttng_pipe *client_quit_pipe;
{
bool thread_running;
struct lttng_pipe *client_quit_pipe;
- struct lttng_thread *thread;
+ struct lttng_thread *thread = NULL;
+ int client_sock_fd = -1;
sem_init(&thread_state.ready, 0, 0);
client_quit_pipe = lttng_pipe_open(FD_CLOEXEC);
sem_init(&thread_state.ready, 0, 0);
client_quit_pipe = lttng_pipe_open(FD_CLOEXEC);
+ client_sock_fd = create_client_sock();
+ if (client_sock_fd < 0) {
+ goto error;
+ }
+
+ thread_state.client_sock = client_sock_fd;
thread = lttng_thread_create("Client management",
thread_manage_clients,
shutdown_client_thread,
thread = lttng_thread_create("Client management",
thread_manage_clients,
shutdown_client_thread,
if (!thread) {
goto error;
}
if (!thread) {
goto error;
}
+ /* The client thread now owns the client sock fd and the quit pipe. */
+ client_sock_fd = -1;
+ client_quit_pipe = NULL;
/*
* This thread is part of the threads that need to be fully
/*
* This thread is part of the threads that need to be fully
*/
thread_running = wait_thread_status();
if (!thread_running) {
*/
thread_running = wait_thread_status();
if (!thread_running) {
- lttng_thread_put(thread);
- thread = NULL;
+ if (client_sock_fd >= 0) {
+ if (close(client_sock_fd)) {
+ PERROR("Failed to close client socket");
+ }
+ }
+ lttng_thread_put(thread);
cleanup_client_thread(client_quit_pipe);
return NULL;
}
cleanup_client_thread(client_quit_pipe);
return NULL;
}
void lttng_thread_put(struct lttng_thread *thread)
{
void lttng_thread_put(struct lttng_thread *thread)
{
+ if (!thread) {
+ return;
+ }
assert(thread->ref.refcount);
urcu_ref_put(&thread->ref, lttng_thread_release);
}
assert(thread->ref.refcount);
urcu_ref_put(&thread->ref, lttng_thread_release);
}