From: Jérémie Galarneau Date: Thu, 20 Oct 2016 19:45:13 +0000 (-0400) Subject: Fix: report an error if unix socket address is too long X-Git-Tag: v2.8.3~11 X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;ds=sidebyside;h=a8bc4cdc16fedd36cac5e6dd1ac6053a6938f972;p=lttng-tools.git Fix: report an error if unix socket address is too long Signed-off-by: Jérémie Galarneau --- 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");