[PATCH v36 6/7] server: Fix getsockname() and accept() on AF_UNIX sockets.

[Ally Sommers]

From: Ally Sommers

---
 server/sock.c | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/server/sock.c b/server/sock.c
index 59b2e84b926..6aecb846b71 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2057,7 +2057,19 @@ static struct sock *accept_socket( struct sock *sock )
         }
         unix_len = sizeof(unix_addr);
         if (!getsockname( acceptfd, &unix_addr.addr, &unix_len ))
-            acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) );
+        {
+            if (sock->family == WS_AF_UNIX)
+            {
+                acceptsock->addr_len = sock->addr_len;
+                acceptsock->addr.un = sock->addr.un;
+            }
+            else
+            {
+                acceptsock->addr_len = sockaddr_from_unix( &unix_addr,
+                                                           &acceptsock->addr.addr,
+                                                           sizeof(acceptsock->addr) );
+            }
+        }
     }
     clear_error();
     sock->pending_events &= ~AFD_POLL_ACCEPT;
@@ -2113,7 +2125,19 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock )

unix_len = sizeof(unix_addr);
     if (!getsockname( get_unix_fd( newfd ), &unix_addr.addr, &unix_len ))
-        acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) );
+    {
+        if (sock->family == WS_AF_UNIX)
+        {
+            acceptsock->addr_len = sock->addr_len;
+            acceptsock->addr.un = sock->addr.un;
+        }
+        else
+        {
+            acceptsock->addr_len = sockaddr_from_unix( &unix_addr,
+                                                       &acceptsock->addr.addr,
+                                                       sizeof(acceptsock->addr) );
+        }
+    }

clear_error();
     sock->pending_events &= ~AFD_POLL_ACCEPT;
@@ -2582,7 +2606,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
     {
         const struct afd_connect_params *params = get_req_data();
         const struct WS_sockaddr *addr;
-        union unix_sockaddr unix_addr;
+        union unix_sockaddr unix_addr, win_addr;
         struct connect_req *req;
         socklen_t unix_len;
         int send_len, ret;
@@ -2644,6 +2668,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
         if (unix_addr.addr.sa_family == AF_INET && !memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ))
             unix_addr.in.sin_addr.s_addr = htonl( INADDR_LOOPBACK );

+        memcpy( &win_addr, &unix_addr, sizeof(unix_addr) );
         if (sock->family == WS_AF_UNIX)
         {
             if (*((struct WS_sockaddr_un *)&addr)->sun_path)
@@ -2657,6 +2682,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
                     set_error( sock_get_ntstatus( errno ) );
                     return;
                 }
+                win_addr.un = unix_addr.un;
                 memcpy( unix_addr.un.sun_path, basename( unix_path ), sizeof(unix_addr.un.sun_path) );
             }
             else
@@ -2695,7 +2721,10 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )

unix_len = sizeof(unix_addr);
         if (!getsockname( unix_fd, &unix_addr.addr, &unix_len ))
-            sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) );
+        {
+            if (sock->family != WS_AF_UNIX)
+                sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) );
+        }
         sock->bound = 1;

if (!ret)