X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=e2d0def8e842f2eb156d82178a71ca3be148f96c;hp=9ef04ee0df1943ce41b4ca886ee2913d27d21619;hb=8bbffd547a5d7ce11413aff2082f97aafe9d7a51;hpb=32dd26fbc3c69fe677a7917535e10ace066e674c diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c index 9ef04ee0d..e2d0def8e 100644 --- a/src/common/sessiond-comm/unix.c +++ b/src/common/sessiond-comm/unix.c @@ -17,6 +17,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -27,15 +28,14 @@ #include #include -#include -#include +#include #include "unix.h" /* * Connect to unix socket using the path name. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_connect_unix_sock(const char *pathname) { struct sockaddr_un sun; @@ -77,7 +77,7 @@ error: * Do an accept(2) on the sock and return the new file descriptor. The socket * MUST be bind(2) before. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_accept_unix_sock(int sock) { int new_fd; @@ -93,11 +93,21 @@ int lttcomm_accept_unix_sock(int sock) return new_fd; } +LTTNG_HIDDEN +int lttcomm_create_anon_unix_socketpair(int *fds) +{ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, fds) < 0) { + PERROR("socketpair"); + return -1; + } + return 0; +} + /* * Creates a AF_UNIX local socket using pathname bind the socket upon creation * and return the fd. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_create_unix_sock(const char *pathname) { struct sockaddr_un sun; @@ -126,13 +136,18 @@ int lttcomm_create_unix_sock(const char *pathname) return fd; error: + if (fd >= 0) { + if (close(fd) < 0) { + PERROR("close create unix sock"); + } + } return ret; } /* * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_listen_unix_sock(int sock) { int ret; @@ -151,12 +166,13 @@ int lttcomm_listen_unix_sock(int sock) * * Return the size of received data. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) { struct msghdr msg; struct iovec iov[1]; ssize_t ret = -1; + size_t len_last; memset(&msg, 0, sizeof(msg)); @@ -166,11 +182,20 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) msg.msg_iovlen = 1; do { - ret = recvmsg(sock, &msg, MSG_WAITALL); - } while (ret < 0 && errno == EINTR); + len_last = iov[0].iov_len; + ret = recvmsg(sock, &msg, MSG_NOSIGNAL); + if (ret > 0) { + iov[0].iov_base += ret; + iov[0].iov_len -= ret; + assert(ret <= len_last); + } + } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR)); if (ret < 0) { PERROR("recvmsg"); + } else if (ret > 0) { + ret = len; } + /* Else ret = 0 meaning an orderly shutdown. */ return ret; } @@ -180,7 +205,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) * * Return the size of sent data. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len) { struct msghdr msg; @@ -211,7 +236,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len) /* * Shutdown cleanly a unix socket. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_close_unix_sock(int sock) { int ret, closeret; @@ -235,7 +260,7 @@ int lttcomm_close_unix_sock(int sock) * * Returns the size of data sent, or negative error value. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) { struct msghdr msg; @@ -247,6 +272,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) char dummy = 0; memset(&msg, 0, sizeof(msg)); + memset(tmp, 0, CMSG_SPACE(sizeof_fds) * sizeof(char)); if (nb_fd > LTTCOMM_MAX_SEND_FDS) return -EINVAL; @@ -255,6 +281,9 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) msg.msg_controllen = CMSG_LEN(sizeof_fds); cmptr = CMSG_FIRSTHDR(&msg); + if (!cmptr) { + return -1; + } cmptr->cmsg_level = SOL_SOCKET; cmptr->cmsg_type = SCM_RIGHTS; cmptr->cmsg_len = CMSG_LEN(sizeof_fds); @@ -290,7 +319,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) * Expect at most "nb_fd" file descriptors. Returns the number of fd * actually received in nb_fd. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd) { struct iovec iov[1]; @@ -356,7 +385,7 @@ end: * * Returns the size of data sent, or negative error value. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) { struct msghdr msg; @@ -367,6 +396,8 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) size_t sizeof_cred = sizeof(lttng_sock_cred); char anc_buf[CMSG_SPACE(sizeof_cred)]; lttng_sock_cred *creds; + + memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char)); #endif /* __linux__ */ memset(&msg, 0, sizeof(msg)); @@ -381,6 +412,9 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) msg.msg_controllen = CMSG_LEN(sizeof_cred); cmptr = CMSG_FIRSTHDR(&msg); + if (!cmptr) { + return -1; + } cmptr->cmsg_level = SOL_SOCKET; cmptr->cmsg_type = LTTNG_SOCK_CREDS; cmptr->cmsg_len = CMSG_LEN(sizeof_cred); @@ -412,13 +446,14 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) * * Returns the size of received data, or negative error value. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, lttng_sock_cred *creds) { struct msghdr msg; struct iovec iov[1]; ssize_t ret; + size_t len_last; #ifdef __linux__ struct cmsghdr *cmptr; size_t sizeof_cred = sizeof(lttng_sock_cred); @@ -445,12 +480,21 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, #endif /* __linux__ */ do { + len_last = iov[0].iov_len; ret = recvmsg(sock, &msg, 0); - } while (ret < 0 && errno == EINTR); + if (ret > 0) { + iov[0].iov_base += ret; + iov[0].iov_len -= ret; + assert(ret <= len_last); + } + } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR)); if (ret < 0) { PERROR("recvmsg fds"); goto end; + } else if (ret > 0) { + ret = len; } + /* Else ret = 0 meaning an orderly shutdown. */ #ifdef __linux__ if (msg.msg_flags & MSG_CTRUNC) { @@ -502,7 +546,7 @@ end: * Set socket option to use credentials passing. */ #ifdef __linux__ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_setsockopt_creds_unix_sock(int sock) { int ret, on = 1; @@ -515,7 +559,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock) return ret; } #elif (defined(__FreeBSD__) || defined(__CYGWIN__)) -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_setsockopt_creds_unix_sock(int sock) { return 0;