X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttkconsumerd%2Fliblttkconsumerd.c;h=9ad380c8dab5e8c1be679a0881890e929f355c57;hp=99bf30eb4c0d6a2f430087ecd52b309bfb3fc388;hb=ca3c5ac0cf100d80352a1a81936b5adc47942f35;hpb=f40799e8d49a5e8161084fa98023f3e571b51962

diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/liblttkconsumerd.c
index 99bf30eb4..9ad380c8d 100644
--- a/liblttkconsumerd/liblttkconsumerd.c
+++ b/liblttkconsumerd/liblttkconsumerd.c
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <urcu/list.h>
+#include <assert.h>
 
 #include "libkernelctl.h"
 #include "liblttkconsumerd.h"
@@ -124,7 +125,6 @@ static int kconsumerd_find_session_fd(int fd)
 	cds_list_for_each_entry(iter, &kconsumerd_data.fd_list.head, list) {
 		if (iter->sessiond_fd == fd) {
 			DBG("Duplicate session fd %d", fd);
-			pthread_mutex_unlock(&kconsumerd_data.lock);
 			return 1;
 		}
 	}
@@ -177,6 +177,7 @@ static int kconsumerd_add_fd(struct lttcomm_kconsumerd_msg *buf, int consumerd_f
 	tmp_fd->state = buf->state;
 	tmp_fd->max_sb_size = buf->max_sb_size;
 	strncpy(tmp_fd->path_name, buf->path_name, PATH_MAX);
+	tmp_fd->path_name[PATH_MAX - 1] = '\0';
 
 	/* Opening the tracefile in write mode */
 	ret = open(tmp_fd->path_name,
@@ -586,7 +587,6 @@ static int kconsumerd_consumerd_recv_fd(int sfd,
 		struct pollfd *kconsumerd_sockpoll, int size,
 		enum kconsumerd_command cmd_type)
 {
-	struct msghdr msg;
 	struct iovec iov[1];
 	int ret = 0, i, tmp2;
 	struct cmsghdr *cmsg;
@@ -597,8 +597,11 @@ static int kconsumerd_consumerd_recv_fd(int sfd,
 	/* the number of fds we are about to receive */
 	nb_fd = size / sizeof(struct lttcomm_kconsumerd_msg);
 
+	/*
+	 * nb_fd is the number of fds we receive. One fd per recvmsg.
+	 */
 	for (i = 0; i < nb_fd; i++) {
-		memset(&msg, 0, sizeof(msg));
+		struct msghdr msg = { 0 };
 
 		/* Prepare to receive the structures */
 		iov[0].iov_base = &lkm;
@@ -632,12 +635,13 @@ static int kconsumerd_consumerd_recv_fd(int sfd,
 			kconsumerd_send_error(KCONSUMERD_ERROR_RECV_FD);
 			goto end;
 		}
+
 		/* if we received fds */
 		if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
 			switch (cmd_type) {
 			case ADD_STREAM:
-				DBG("kconsumerd_add_fd %s (%d)", lkm.path_name, (CMSG_DATA(cmsg)[0]));
-				ret = kconsumerd_add_fd(&lkm, (CMSG_DATA(cmsg)[0]));
+				DBG("kconsumerd_add_fd %s (%d)", lkm.path_name, ((int *) CMSG_DATA(cmsg))[0]);
+				ret = kconsumerd_add_fd(&lkm, ((int *) CMSG_DATA(cmsg))[0]);
 				if (ret < 0) {
 					kconsumerd_send_error(KCONSUMERD_OUTFD_ERROR);
 					goto end;
@@ -1001,7 +1005,7 @@ end:
  */
 void kconsumerd_cleanup(void)
 {
-	struct kconsumerd_fd *iter;
+	struct kconsumerd_fd *iter, *tmp;
 
 	/* remove the socket file */
 	unlink(kconsumerd_command_sock_path);
@@ -1011,7 +1015,7 @@ void kconsumerd_cleanup(void)
 	 * running (after joining on the threads), no need to protect
 	 * list iteration with mutex.
 	 */
-	cds_list_for_each_entry(iter, &kconsumerd_data.fd_list.head, list) {
+	cds_list_for_each_entry_safe(iter, tmp, &kconsumerd_data.fd_list.head, list) {
 		kconsumerd_del_fd(iter);
 	}
 }