swrap: abort on mutex errors

[socket_wrapper.git] / src / socket_wrapper.c

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index d72b31f0821093e291f46b092719e0455a652fd1..00db6f0cb833066a749e7bf9939c06af58e2638d 100644 (file)
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -755,6 +755,7 @@ static void _swrap_mutex_lock(pthread_mutex_t *mutex, const char *name, const ch
        if (ret != 0) {
                SWRAP_LOG(SWRAP_LOG_ERROR, "PID(%d):PPID(%d): %s(%u): Couldn't lock pthread mutex(%s) - %s",
                          getpid(), getppid(), caller, line, name, strerror(ret));
+               abort();
        }
 }
 
@@ -767,6 +768,7 @@ static void _swrap_mutex_unlock(pthread_mutex_t *mutex, const char *name, const
        if (ret != 0) {
                SWRAP_LOG(SWRAP_LOG_ERROR, "PID(%d):PPID(%d): %s(%u): Couldn't unlock pthread mutex(%s) - %s",
                          getpid(), getppid(), caller, line, name, strerror(ret));
+               abort();
        }
 }
 
@@ -3656,6 +3658,33 @@ static int swrap_accept(int s,
        /* Check if we have a stale fd and remove it */
        swrap_remove_stale(fd);
 
+       if (un_addr.sa.un.sun_path[0] == '\0') {
+               /*
+                * FreeBSD seems to have a problem where
+                * accept4() on the unix socket doesn't
+                * ECONNABORTED for already disconnected connections.
+                *
+                * Let's try libc_getpeername() to get the peer address
+                * as a fallback, but it'll likely return ENOTCONN,
+                * which we have to map to ECONNABORTED.
+                */
+               un_addr.sa_socklen = sizeof(struct sockaddr_un),
+               ret = libc_getpeername(fd, &un_addr.sa.s, &un_addr.sa_socklen);
+               if (ret == -1) {
+                       int saved_errno = errno;
+                       libc_close(fd);
+                       if (saved_errno == ENOTCONN) {
+                               /*
+                                * If the connection is already disconnected
+                                * we should return ECONNABORTED.
+                                */
+                               saved_errno = ECONNABORTED;
+                       }
+                       errno = saved_errno;
+                       return ret;
+               }
+       }
+
        ret = libc_getsockname(fd,
                               &un_my_addr.sa.s,
                               &un_my_addr.sa_socklen);