X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Funix.c;h=4d1c34cff96b0f30a744e5c7b9f8079dbdd6d317;hb=a8bc4cdc16fedd36cac5e6dd1ac6053a6938f972;hp=ec03d8bbfa4b5053355e1cf616aa5fb44ff182fc;hpb=4a3a81ecdf4bf70a04c4b683222df9b6e655739f;p=lttng-tools.git

diff --git a/src/common/unix.c b/src/common/unix.c
index ec03d8bbf..4d1c34cff 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");
@@ -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");