From 7f8bf46706c381d1a340a07b728dfcebafa72afc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 20 Oct 2016 15:45:13 -0400 Subject: [PATCH] Fix: report an error if unix socket address is too long MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/common/unix.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/common/unix.c b/src/common/unix.c index 7bcbb688b..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"); @@ -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"); -- 2.34.1