Merge pull request #2964 from tomponline/tp-l2proxy

[mirror_lxc.git] / src / lxc / af_unix.c

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index 328f891f0b7a3d7384acc044ab75961370e03b0b..9e2f8587c8364b86558ef1fbe919f352f2130f1e 100644 (file)
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -156,7 +156,8 @@ int lxc_abstract_unix_connect(const char *path)
 int lxc_abstract_unix_send_fds(int fd, int *sendfds, int num_sendfds,
                               void *data, size_t size)
 {
-       __do_free char *cmsgbuf;
+       __do_free char *cmsgbuf = NULL;
+       int ret;
        struct msghdr msg;
        struct iovec iov;
        struct cmsghdr *cmsg = NULL;
@@ -189,13 +190,25 @@ int lxc_abstract_unix_send_fds(int fd, int *sendfds, int num_sendfds,
        msg.msg_iov = &iov;
        msg.msg_iovlen = 1;
 
-       return sendmsg(fd, &msg, MSG_NOSIGNAL);
+again:
+       ret = sendmsg(fd, &msg, MSG_NOSIGNAL);
+       if (ret < 0)
+               if (errno == EINTR)
+                       goto again;
+
+       return ret;
+}
+
+int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data,
+                     size_t size)
+{
+       return lxc_abstract_unix_send_fds(fd, sendfds, num_sendfds, data, size);
 }
 
 int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
                               void *data, size_t size)
 {
-       __do_free char *cmsgbuf;
+       __do_free char *cmsgbuf = NULL;
        int ret;
        struct msghdr msg;
        struct iovec iov;
@@ -221,8 +234,15 @@ int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
        msg.msg_iov = &iov;
        msg.msg_iovlen = 1;
 
+again:
        ret = recvmsg(fd, &msg, 0);
-       if (ret <= 0)
+       if (ret < 0) {
+               if (errno == EINTR)
+                       goto again;
+
+               goto out;
+       }
+       if (ret == 0)
                goto out;
 
        /*
@@ -351,18 +371,23 @@ int lxc_unix_connect(struct sockaddr_un *addr)
        int ret;
        ssize_t len;
 
-       fd = socket(PF_UNIX, SOCK_STREAM, SOCK_CLOEXEC);
-       if (fd < 0)
+       fd = socket(AF_UNIX, SOCK_STREAM, 0);
+       if (fd < 0) {
+               SYSERROR("Failed to open new AF_UNIX socket");
                return -1;
+       }
 
        if (addr->sun_path[0] == '\0')
                len = strlen(&addr->sun_path[1]);
        else
                len = strlen(&addr->sun_path[0]);
-       ret = connect(fd, (struct sockaddr *)&addr,
-                     offsetof(struct sockaddr_un, sun_path) + len + 1);
-       if (ret < 0)
+
+       ret = connect(fd, (struct sockaddr *)addr,
+                     offsetof(struct sockaddr_un, sun_path) + len);
+       if (ret < 0) {
+               SYSERROR("Failed to bind new AF_UNIX socket");
                return -1;
+       }
 
        return move_fd(fd);
 }