daemon: fix IPv6 address truncation in ip2str()

The sockaddr struct size (ai_addrlen) is passed as the output buffer
size to inet_ntop(). For IPv6, sizeof(sockaddr_in6) is 28 bytes but
INET6_ADDRSTRLEN is 46, so long IPv6 addresses are silently truncated.

Fix this by passing sizeof(ip) instead, which is the actual size of
the destination buffer. Drop the now-unused len parameter from
ip2str() and update all callers.

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/daemon.c b/daemon.c
index 80fa0226d89f03215f9c75eaca0576f3343982eb..103c08d868d5de434dfe900a8294de5b8eaa8995 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -947,7 +947,7 @@ struct socketlist {
        size_t alloc;
 };
 
-static const char *ip2str(int family, struct sockaddr *sin, socklen_t len)
+static const char *ip2str(int family, struct sockaddr *sin)
 {
 #ifdef NO_IPV6
        static char ip[INET_ADDRSTRLEN];
@@ -958,11 +958,11 @@ static const char *ip2str(int family, struct sockaddr *sin, socklen_t len)
        switch (family) {
 #ifndef NO_IPV6
        case AF_INET6:
-               inet_ntop(family, &((struct sockaddr_in6*)sin)->sin6_addr, ip, len);
+               inet_ntop(family, &((struct sockaddr_in6*)sin)->sin6_addr, ip, sizeof(ip));
                break;
 #endif
        case AF_INET:
-               inet_ntop(family, &((struct sockaddr_in*)sin)->sin_addr, ip, len);
+               inet_ntop(family, &((struct sockaddr_in*)sin)->sin_addr, ip, sizeof(ip));
                break;
        default:
                xsnprintf(ip, sizeof(ip), "<unknown>");
@@ -1019,14 +1019,14 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
 
                if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
                        logerror("Could not bind to %s: %s",
-                                ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),
+                                ip2str(ai->ai_family, ai->ai_addr),
                                 strerror(errno));
                        close(sockfd);
                        continue;       /* not fatal */
                }
                if (listen(sockfd, 5) < 0) {
                        logerror("Could not listen to %s: %s",
-                                ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),
+                                ip2str(ai->ai_family, ai->ai_addr),
                                 strerror(errno));
                        close(sockfd);
                        continue;       /* not fatal */
@@ -1080,7 +1080,7 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
 
        if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {
                logerror("Could not bind to %s: %s",
-                        ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),
+                        ip2str(AF_INET, (struct sockaddr *)&sin),
                         strerror(errno));
                close(sockfd);
                return 0;
@@ -1088,7 +1088,7 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
 
        if (listen(sockfd, 5) < 0) {
                logerror("Could not listen to %s: %s",
-                        ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),
+                        ip2str(AF_INET, (struct sockaddr *)&sin),
                         strerror(errno));
                close(sockfd);
                return 0;