9 files changed, 97 insertions, 62 deletions

diff --git a/src/lib/libc/net/ether_aton.3 b/src/lib/libc/net/ether_aton.3
index 98562dc44c..83fe98880c 100644
--- a/src/lib/libc/net/ether_aton.3
+++ b/src/lib/libc/net/ether_aton.3
@@ -1,8 +1,8 @@
-.\"     $OpenBSD: ether_aton.3,v 1.3 2022/09/11 06:38:10 jmc Exp $
+.\"     $OpenBSD: ether_aton.3,v 1.4 2025/06/29 00:33:46 dlg Exp $
 .\"
 .\" Written by roland@frob.com.  Public domain.
 .\"
-.Dd $Mdocdate: September 11 2022 $
+.Dd $Mdocdate: June 29 2025 $
 .Dt ETHER_ATON 3
 .Os
 .Sh NAME
@@ -19,7 +19,7 @@
 .In netinet/in.h
 .In netinet/if_ether.h
 .Ft char *
-.Fn ether_ntoa "struct ether_addr *e"
+.Fn ether_ntoa "const struct ether_addr *e"
 .Ft struct ether_addr *
 .Fn ether_aton "const char *s"
 .Ft int
diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c
index d62be1ca71..6edad5c5e5 100644
--- a/src/lib/libc/net/ethers.c
+++ b/src/lib/libc/net/ethers.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ethers.c,v 1.27 2019/01/25 00:19:25 millert Exp $     */
+/*      $OpenBSD: ethers.c,v 1.28 2025/06/29 00:33:46 dlg Exp $ */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <millert@openbsd.org>
@@ -42,7 +42,7 @@
 static char * _ether_aton(const char *, struct ether_addr *);
 
 char *
-ether_ntoa(struct ether_addr *e)
+ether_ntoa(const struct ether_addr *e)
 {
         static char a[] = "xx:xx:xx:xx:xx:xx";
 
diff --git a/src/lib/libc/net/freeaddrinfo.c b/src/lib/libc/net/freeaddrinfo.c
index 154f70cd75..c06318fb75 100644
--- a/src/lib/libc/net/freeaddrinfo.c
+++ b/src/lib/libc/net/freeaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: freeaddrinfo.c,v 1.9 2016/09/21 04:38:56 guenther Exp $       */
+/*      $OpenBSD: freeaddrinfo.c,v 1.10 2025/12/08 13:30:08 jca Exp $   */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, Craig Metz, All rights reserved.
@@ -40,11 +40,15 @@ freeaddrinfo(struct addrinfo *ai)
 {
         struct addrinfo *p;
 
-        do {
+        /*
+         * Calling freeaddrinfo() with a NULL pointer is unspecified,
+         * but try to cope with it anyway for compatibility.
+         */
+        while (ai != NULL) {
                 p = ai;
                 ai = ai->ai_next;
                 free(p->ai_canonname);
                 free(p);
-        } while (ai);
+        }
 }
 DEF_WEAK(freeaddrinfo);
diff --git a/src/lib/libc/net/gai_strerror.3 b/src/lib/libc/net/gai_strerror.3
index d271f492c5..93d11aad09 100644
--- a/src/lib/libc/net/gai_strerror.3
+++ b/src/lib/libc/net/gai_strerror.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: gai_strerror.3,v 1.10 2017/05/03 01:58:33 deraadt Exp $
+.\"     $OpenBSD: gai_strerror.3,v 1.11 2025/06/13 18:34:00 schwarze Exp $
 .\"     $KAME: gai_strerror.3,v 1.1 2005/01/05 03:04:47 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 3 2017 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt GAI_STRERROR 3
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@
 .In sys/types.h
 .In sys/socket.h
 .In netdb.h
-.Ft "const char *"
+.Ft const char *
 .Fn gai_strerror "int ecode"
 .Sh DESCRIPTION
 The
diff --git a/src/lib/libc/net/getaddrinfo.3 b/src/lib/libc/net/getaddrinfo.3
index 780c7a409f..2df5fbe896 100644
--- a/src/lib/libc/net/getaddrinfo.3
+++ b/src/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: getaddrinfo.3,v 1.61 2022/09/11 06:38:10 jmc Exp $
+.\"     $OpenBSD: getaddrinfo.3,v 1.62 2025/12/08 13:30:08 jca Exp $
 .\"     $KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 11 2022 $
+.Dd $Mdocdate: December 8 2025 $
 .Dt GETADDRINFO 3
 .Os
 .Sh NAME
@@ -475,3 +475,7 @@ flag bit first appeared in Windows 7.
 .%R RFC 4007
 .%T IPv6 Scoped Address Architecture
 .Re
+.Sh CAVEATS
+The behavior of
+.Fn freeaddrinfo "NULL"
+is not specified and therefore not portable.
diff --git a/src/lib/libc/net/getifaddrs.c b/src/lib/libc/net/getifaddrs.c
index 069ee9afab..448e76097f 100644
--- a/src/lib/libc/net/getifaddrs.c
+++ b/src/lib/libc/net/getifaddrs.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getifaddrs.c,v 1.14 2021/11/29 03:20:37 deraadt Exp $ */
+/*      $OpenBSD: getifaddrs.c,v 1.15 2025/11/13 10:34:32 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995, 1999
@@ -25,10 +25,10 @@
  *      BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
  */
 
-#include <sys/param.h>  /* ALIGN ALIGNBYTES */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/syslog.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <sys/sysctl.h>
@@ -38,35 +38,32 @@
 #include <ifaddrs.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdio.h>
 
-#define SALIGN  (sizeof(long) - 1)
-#define SA_RLEN(sa)     ((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : (SALIGN + 1))
+#define roundup(x, y)   ((((uintptr_t)(x)+((y)-1))/(y))*(y))
+#define proundup(x, y)  (void *)roundup(x,y)
+
+#define SA_RLEN(sa)     ((sa)->sa_len ? \
+                            roundup((sa)->sa_len, sizeof(long)) : \
+                            roundup(1, sizeof(long)))
 
 int
 getifaddrs(struct ifaddrs **pif)
 {
-        int icnt = 1;
-        int dcnt = 0;
-        int ncnt = 0;
-        int mib[6];
+        int icnt = 1, dcnt = 0, ncnt = 0, mib[6], i;
         size_t needed;
-        char *buf = NULL, *bufp;
-        char *next;
-        struct ifaddrs *cif = 0;
-        char *p, *p0;
+        char *buf = NULL, *bufp, *data, *names, *next, *p, *p0;
+        struct ifaddrs *cif = 0, *ifa, *ift;
         struct rt_msghdr *rtm;
         struct if_msghdr *ifm;
         struct ifa_msghdr *ifam;
         struct sockaddr_dl *dl;
         struct sockaddr *sa;
         u_short index = 0;
-        size_t len, alen, dlen;
-        struct ifaddrs *ifa, *ift;
-        int i;
-        char *data;
-        char *names;
+        size_t len, alen, dlen, dsize;
 
         mib[0] = CTL_NET;
         mib[1] = PF_ROUTE;
@@ -95,6 +92,7 @@ getifaddrs(struct ifaddrs **pif)
                 break;
         }
 
+        /* Calculate data buffer size */
         for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
                 rtm = (struct rt_msghdr *)next;
                 if (rtm->rtm_version != RTM_VERSION)
@@ -107,10 +105,15 @@ getifaddrs(struct ifaddrs **pif)
                                 ++icnt;
                                 dl = (struct sockaddr_dl *)(next +
                                     rtm->rtm_hdrlen);
-                                dcnt += SA_RLEN((struct sockaddr *)dl) +
-                                        ALIGNBYTES;
-                                dcnt += sizeof(ifm->ifm_data);
                                 ncnt += dl->sdl_nlen + 1;
+
+                                /* sockaddr's need long alignment */
+                                dcnt = roundup(dcnt, sizeof(long));
+                                dcnt += SA_RLEN((struct sockaddr *)dl);
+
+                                /* ifm_data[] needs long long alignment */
+                                dcnt = roundup(dcnt, sizeof(long long));
+                                dcnt += sizeof(ifm->ifm_data);
                         } else
                                 index = 0;
                         break;
@@ -145,6 +148,8 @@ getifaddrs(struct ifaddrs **pif)
                                         continue;
                                 sa = (struct sockaddr *)p;
                                 len = SA_RLEN(sa);
+                                /* sockaddr's need long alignment */
+                                dcnt = roundup(dcnt, sizeof(long));
                                 if (i == RTAX_NETMASK && sa->sa_len == 0)
                                         dcnt += alen;
                                 else
@@ -155,23 +160,29 @@ getifaddrs(struct ifaddrs **pif)
                 }
         }
 
-        if (icnt + dcnt + ncnt == 1) {
+        if (icnt + ncnt + dcnt == 1) {
                 *pif = NULL;
                 free(buf);
                 return (0);
         }
-        data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
+
+        dsize = sizeof(struct ifaddrs) * icnt;
+        dsize += ncnt;
+        dsize = roundup(dsize, sizeof(long long));
+        dsize += dcnt;
+
+        data = calloc(dsize, 1);
         if (data == NULL) {
                 free(buf);
                 return(-1);
         }
 
-        ifa = (struct ifaddrs *)data;
+        /* ifaddrs[], names, then if_data[] */
+        ift = ifa = (struct ifaddrs *)data;
         data += sizeof(struct ifaddrs) * icnt;
-        names = data + dcnt;
-
-        memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
-        ift = ifa;
+        names = data;
+        data += ncnt;
+        data = proundup(data, sizeof(long long));
 
         index = 0;
         for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
@@ -193,19 +204,21 @@ getifaddrs(struct ifaddrs **pif)
                                 names[dl->sdl_nlen] = 0;
                                 names += dl->sdl_nlen + 1;
 
+                                data = proundup(data, sizeof(long));
                                 ift->ifa_addr = (struct sockaddr *)data;
                                 memcpy(data, dl,
                                     ((struct sockaddr *)dl)->sa_len);
                                 data += SA_RLEN((struct sockaddr *)dl);
 
-                                /* ifm_data needs to be aligned */
-                                ift->ifa_data = data = (void *)ALIGN(data);
+                                /* if_data needs long long alignment */
+                                data = proundup(data, sizeof(long long));
+                                ift->ifa_data = data;
                                 dlen = rtm->rtm_hdrlen -
                                     offsetof(struct if_msghdr, ifm_data);
                                 if (dlen > sizeof(ifm->ifm_data))
                                         dlen = sizeof(ifm->ifm_data);
                                 memcpy(data, &ifm->ifm_data, dlen);
-                                data += sizeof(ifm->ifm_data);
+                                data += dlen;
 
                                 ift = (ift->ifa_next = ift + 1);
                         } else
@@ -245,12 +258,14 @@ getifaddrs(struct ifaddrs **pif)
                                 len = SA_RLEN(sa);
                                 switch (i) {
                                 case RTAX_IFA:
+                                        data = proundup(data, sizeof(long));
                                         ift->ifa_addr = (struct sockaddr *)data;
                                         memcpy(data, p, len);
                                         data += len;
                                         break;
 
                                 case RTAX_NETMASK:
+                                        data = proundup(data, sizeof(long));
                                         ift->ifa_netmask =
                                             (struct sockaddr *)data;
                                         if (sa->sa_len == 0) {
@@ -263,6 +278,7 @@ getifaddrs(struct ifaddrs **pif)
                                         break;
 
                                 case RTAX_BRD:
+                                        data = proundup(data, sizeof(long));
                                         ift->ifa_broadaddr =
                                             (struct sockaddr *)data;
                                         memcpy(data, p, len);
@@ -278,6 +294,17 @@ getifaddrs(struct ifaddrs **pif)
                 }
         }
 
+        /* XXX temporary paranoia until we are sure it is bug free */
+        if (dsize != (char *)data - (char *)ifa) {
+                char buf[1024];
+
+                /* <10> is LOG_CRIT */
+                snprintf(buf, sizeof buf,
+                    "<10>%s: getifaddrs: allocated %lu used %lu\n",
+                    __progname, dsize, (char *)data - (char *)ifa);
+                sendsyslog(buf, strlen(buf), LOG_CONS);
+        }
+
         free(buf);
         if (--ift >= ifa) {
                 ift->ifa_next = NULL;
diff --git a/src/lib/libc/net/if_indextoname.3 b/src/lib/libc/net/if_indextoname.3
index 25d2a2722f..9d00d66bd5 100644
--- a/src/lib/libc/net/if_indextoname.3
+++ b/src/lib/libc/net/if_indextoname.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: if_indextoname.3,v 1.16 2015/11/21 07:48:10 jmc Exp $
+.\"     $OpenBSD: if_indextoname.3,v 1.17 2025/06/13 18:34:00 schwarze Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"     The Regents of the University of California.  All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     From: @(#)rcmd.3        8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: November 21 2015 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt IF_NAMETOINDEX 3
 .Os
 .Sh NAME
@@ -41,13 +41,13 @@
 .In sys/types.h
 .In sys/socket.h
 .In net/if.h
-.Ft "unsigned int"
+.Ft unsigned int
 .Fn if_nametoindex "const char *ifname"
-.Ft "char *"
+.Ft char *
 .Fn if_indextoname "unsigned int ifindex" "char *ifname"
-.Ft "struct if_nameindex *"
+.Ft struct if_nameindex *
 .Fn if_nameindex "void"
-.Ft "void"
+.Ft void
 .Fn if_freenameindex "struct if_nameindex *ptr"
 .Sh DESCRIPTION
 These functions map interface indexes to interface names (such as
diff --git a/src/lib/libc/net/inet6_opt_init.3 b/src/lib/libc/net/inet6_opt_init.3
index 41ba842166..87244507a9 100644
--- a/src/lib/libc/net/inet6_opt_init.3
+++ b/src/lib/libc/net/inet6_opt_init.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: inet6_opt_init.3,v 1.8 2022/03/31 17:27:16 naddy Exp $
+.\"     $OpenBSD: inet6_opt_init.3,v 1.9 2025/06/13 18:34:00 schwarze Exp $
 .\"     $KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt INET6_OPT_INIT 3
 .Os
 .\"
@@ -44,19 +44,19 @@
 .\"
 .Sh SYNOPSIS
 .In netinet/in.h
-.Ft "int"
+.Ft int
 .Fn inet6_opt_init "void *extbuf" "socklen_t extlen"
-.Ft "int"
+.Ft int
 .Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t len" "u_int8_t align" "void **databufp"
-.Ft "int"
+.Ft int
 .Fn inet6_opt_finish "void *extbuf" "socklen_t extlen" "int offset"
-.Ft "int"
+.Ft int
 .Fn inet6_opt_set_val "void *databuf" "int offset" "void *val" "socklen_t vallen"
-.Ft "int"
+.Ft int
 .Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t *typep" "socklen_t *lenp" "void **databufp"
-.Ft "int"
+.Ft int
 .Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp"
-.Ft "int"
+.Ft int
 .Fn inet6_opt_get_val "void *databuf" "socklen_t offset" "void *val" "socklen_t vallen"
 .\"
 .Sh DESCRIPTION
diff --git a/src/lib/libc/net/inet6_rth_space.3 b/src/lib/libc/net/inet6_rth_space.3
index c40b45057e..7304266fe1 100644
--- a/src/lib/libc/net/inet6_rth_space.3
+++ b/src/lib/libc/net/inet6_rth_space.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: inet6_rth_space.3,v 1.8 2022/03/31 17:27:16 naddy Exp $
+.\"     $OpenBSD: inet6_rth_space.3,v 1.9 2025/06/13 18:34:00 schwarze Exp $
 .\"     $KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt INET6_RTH_SPACE 3
 .Os
 .\"
@@ -45,7 +45,7 @@
 .In netinet/in.h
 .Ft socklen_t
 .Fn inet6_rth_space "int" "int"
-.Ft "void *"
+.Ft void *
 .Fn inet6_rth_init "void *" "socklen_t" "int" "int"
 .Ft int
 .Fn inet6_rth_add "void *" "const struct in6_addr *"
@@ -53,7 +53,7 @@
 .Fn inet6_rth_reverse "const void *" "void *"
 .Ft int
 .Fn inet6_rth_segments "const void *"
-.Ft "struct in6_addr *"
+.Ft struct in6_addr *
 .Fn inet6_rth_getaddr "const void *" "int"
 .\"
 .Sh DESCRIPTION