From 4100e49a2dffca1e81c487b4e02783d901569102 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 11 Oct 2013 16:02:13 -0400 Subject: [PATCH] Fix: recv creds comm should handle partial receive Signed-off-by: David Goulet --- src/common/sessiond-comm/unix.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c index 0d7c95a76..2c87b82c4 100644 --- a/src/common/sessiond-comm/unix.c +++ b/src/common/sessiond-comm/unix.c @@ -435,6 +435,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, 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); @@ -461,12 +462,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) { -- 2.34.1