X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=39ac89d53281804d33598d2f08538480108b4c30;hb=0a09ade80911354bd1f86daed6f00dc843de6a7a;hp=a66bb750a8633567d8020ba3ac1c1d6571f62662;hpb=b51ae08035921b63b417f9364081b92d70280e9f;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index a66bb750a..39ac89d53 100644
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -41,6 +41,14 @@ int lttcomm_connect_unix_sock(const char *pathname)
 	struct sockaddr_un sun;
 	int fd, ret, closeret;
 
+	if (strlen(pathname) >= sizeof(sun.sun_path)) {
+		ERR("unix socket address (\"%s\") is longer than the platform's limit (%zu > %zu).",
+				pathname, strlen(pathname) + 1,
+				sizeof(sun.sun_path));
+		ret = -ENAMETOOLONG;
+		goto error;
+	}
+
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
 		PERROR("socket");
@@ -93,6 +101,16 @@ int lttcomm_accept_unix_sock(int sock)
 	return new_fd;
 }
 
+LTTNG_HIDDEN
+int lttcomm_create_anon_unix_socketpair(int *fds)
+{
+	if (socketpair(PF_UNIX, SOCK_STREAM, 0, fds) < 0) {
+		PERROR("socketpair");
+		return -1;
+	}
+	return 0;
+}
+
 /*
  * Creates a AF_UNIX local socket using pathname bind the socket upon creation
  * and return the fd.
@@ -101,9 +119,17 @@ LTTNG_HIDDEN
 int lttcomm_create_unix_sock(const char *pathname)
 {
 	struct sockaddr_un sun;
-	int fd;
+	int fd = -1;
 	int ret = -1;
 
+	if (strlen(pathname) >= sizeof(sun.sun_path)) {
+		ERR("unix socket address (\"%s\") is longer than the platform's limit (%zu > %zu).",
+				pathname, strlen(pathname) + 1,
+				sizeof(sun.sun_path));
+		ret = -ENAMETOOLONG;
+		goto error;
+	}
+
 	/* Create server socket */
 	if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
 		PERROR("socket");
@@ -271,6 +297,9 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	msg.msg_controllen = CMSG_LEN(sizeof_fds);
 
 	cmptr = CMSG_FIRSTHDR(&msg);
+	if (!cmptr) {
+		return -1;
+	}
 	cmptr->cmsg_level = SOL_SOCKET;
 	cmptr->cmsg_type = SCM_RIGHTS;
 	cmptr->cmsg_len = CMSG_LEN(sizeof_fds);
@@ -398,6 +427,9 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 	msg.msg_controllen = CMSG_LEN(sizeof_cred);
 
 	cmptr = CMSG_FIRSTHDR(&msg);
+	if (!cmptr) {
+		return -1;
+	}
 	cmptr->cmsg_level = SOL_SOCKET;
 	cmptr->cmsg_type = LTTNG_SOCK_CREDS;
 	cmptr->cmsg_len = CMSG_LEN(sizeof_cred);