X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=cf2c17ff7ad62444861d562cb9ec42c09d8e1077;hp=a66bb750a8633567d8020ba3ac1c1d6571f62662;hb=0641441730f08fa4f489db13621edbd85831ea4e;hpb=fbe49b3b8c9dc03d99441f68dfb8bcf7450d71e3

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index a66bb750a..cf2c17ff7 100644
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
@@ -38,7 +37,7 @@
 LTTNG_HIDDEN
 int lttcomm_connect_unix_sock(const char *pathname)
 {
-	struct sockaddr_un sun;
+	struct sockaddr_un s_un;
 	int fd, ret, closeret;
 
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
@@ -48,12 +47,12 @@ int lttcomm_connect_unix_sock(const char *pathname)
 		goto error;
 	}
 
-	memset(&sun, 0, sizeof(sun));
-	sun.sun_family = AF_UNIX;
-	strncpy(sun.sun_path, pathname, sizeof(sun.sun_path));
-	sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+	memset(&s_un, 0, sizeof(s_un));
+	s_un.sun_family = AF_UNIX;
+	strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path));
+	s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0';
 
-	ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun));
+	ret = connect(fd, (struct sockaddr *) &s_un, sizeof(s_un));
 	if (ret < 0) {
 		/*
 		 * Don't print message on connect error, because connect is used in
@@ -81,11 +80,11 @@ LTTNG_HIDDEN
 int lttcomm_accept_unix_sock(int sock)
 {
 	int new_fd;
-	struct sockaddr_un sun;
+	struct sockaddr_un s_un;
 	socklen_t len = 0;
 
 	/* Blocking call */
-	new_fd = accept(sock, (struct sockaddr *) &sun, &len);
+	new_fd = accept(sock, (struct sockaddr *) &s_un, &len);
 	if (new_fd < 0) {
 		PERROR("accept");
 	}
@@ -93,6 +92,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.
@@ -100,7 +109,7 @@ int lttcomm_accept_unix_sock(int sock)
 LTTNG_HIDDEN
 int lttcomm_create_unix_sock(const char *pathname)
 {
-	struct sockaddr_un sun;
+	struct sockaddr_un s_un;
 	int fd;
 	int ret = -1;
 
@@ -110,14 +119,14 @@ int lttcomm_create_unix_sock(const char *pathname)
 		goto error;
 	}
 
-	memset(&sun, 0, sizeof(sun));
-	sun.sun_family = AF_UNIX;
-	strncpy(sun.sun_path, pathname, sizeof(sun.sun_path));
-	sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+	memset(&s_un, 0, sizeof(s_un));
+	s_un.sun_family = AF_UNIX;
+	strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path));
+	s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0';
 
 	/* Unlink the old file if present */
 	(void) unlink(pathname);
-	ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
+	ret = bind(fd, (struct sockaddr *) &s_un, sizeof(s_un));
 	if (ret < 0) {
 		PERROR("bind");
 		goto error;
@@ -271,6 +280,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);
@@ -383,10 +395,11 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 	size_t sizeof_cred = sizeof(lttng_sock_cred);
 	char anc_buf[CMSG_SPACE(sizeof_cred)];
 	lttng_sock_cred *creds;
+
+	memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char));
 #endif /* __linux__ */
 
 	memset(&msg, 0, sizeof(msg));
-	memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char));
 
 	iov[0].iov_base = buf;
 	iov[0].iov_len = len;
@@ -398,6 +411,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);
@@ -508,7 +524,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 	}
 
 	memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
 	{
 		int peer_ret;
 
@@ -541,7 +557,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	}
 	return ret;
 }
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
 LTTNG_HIDDEN
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {