X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Funix.c;h=11c30781ba02ea5fa81f84e7f7400e15bb4436ce;hp=e294936cade132a4771f9c65a8feb49cc5e26615;hb=7f8bf46706c381d1a340a07b728dfcebafa72afc;hpb=2038dd6ce78bc856ece474626b7f039d19860bce

diff --git a/src/common/unix.c b/src/common/unix.c
index e294936ca..11c30781b 100644
--- a/src/common/unix.c
+++ b/src/common/unix.c
@@ -41,6 +41,14 @@ int lttcomm_connect_unix_sock(const char *pathname)
 	struct sockaddr_un s_un;
 	int fd, ret, closeret;
 
+	if (strlen(pathname) >= sizeof(s_un.sun_path)) {
+		ERR("unix socket address (\"%s\") is longer than the platform's limit (%zu > %zu).",
+				pathname, strlen(pathname) + 1,
+				sizeof(s_un.sun_path));
+		ret = -ENAMETOOLONG;
+		goto error;
+	}
+
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
 		PERROR("socket");
@@ -82,7 +90,7 @@ int lttcomm_accept_unix_sock(int sock)
 {
 	int new_fd;
 	struct sockaddr_un s_un;
-	socklen_t len = 0;
+	socklen_t len = sizeof(s_un);
 
 	/* Blocking call */
 	new_fd = accept(sock, (struct sockaddr *) &s_un, &len);
@@ -111,9 +119,17 @@ LTTNG_HIDDEN
 int lttcomm_create_unix_sock(const char *pathname)
 {
 	struct sockaddr_un s_un;
-	int fd;
+	int fd = -1;
 	int ret = -1;
 
+	if (strlen(pathname) >= sizeof(s_un.sun_path)) {
+		ERR("unix socket address (\"%s\") is longer than the platform's limit (%zu > %zu).",
+				pathname, strlen(pathname) + 1,
+				sizeof(s_un.sun_path));
+		ret = -ENAMETOOLONG;
+		goto error;
+	}
+
 	/* Create server socket */
 	if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
 		PERROR("socket");
@@ -525,7 +541,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__) || defined(__sun__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
 	{
 		int peer_ret;
 
@@ -558,7 +574,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	}
 	return ret;
 }
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
 LTTNG_HIDDEN
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {