Deliverables 3 and 4

[lttng-tools.git] / src / common / unix.c

diff --git a/src/common/unix.c b/src/common/unix.c
index 7bcbb688b7389f9eb2fccba4b50c7db58a67ee6e..1d4ee9b3686b1a38efa2d74cf7bc6c2939be95ee 100644 (file)
--- 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");
@@ -210,7 +226,7 @@ ssize_t lttcomm_send_unix_sock(int sock, const void *buf, size_t len)
 {
        struct msghdr msg;
        struct iovec iov[1];
-       ssize_t ret = -1;
+       ssize_t ret;
 
        memset(&msg, 0, sizeof(msg));
 
@@ -219,17 +235,28 @@ ssize_t lttcomm_send_unix_sock(int sock, const void *buf, size_t len)
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
 
-       ret = sendmsg(sock, &msg, 0);
-       if (ret < 0) {
-               /*
-                * Only warn about EPIPE when quiet mode is deactivated.
-                * We consider EPIPE as expected.
-                */
-               if (errno != EPIPE || !lttng_opt_quiet) {
-                       PERROR("sendmsg");
+       while (iov[0].iov_len) {
+               ret = sendmsg(sock, &msg, 0);
+               if (ret < 0) {
+                       if (errno == EINTR) {
+                               continue;
+                       } else {
+                               /*
+                                * Only warn about EPIPE when quiet mode is
+                                * deactivated.
+                                * We consider EPIPE as expected.
+                                */
+                               if (errno != EPIPE || !lttng_opt_quiet) {
+                                       PERROR("sendmsg");
+                               }
+                               goto end;
+                       }
                }
+               iov[0].iov_len -= ret;
+               iov[0].iov_base += ret;
        }
-
+       ret = len;
+end:
        return ret;
 }