24 files changed, 294 insertions, 158 deletions

diff --git a/src/lib/libc/include/namespace.h b/src/lib/libc/include/namespace.h
index 8503de47be..cc83735b90 100644
--- a/src/lib/libc/include/namespace.h
+++ b/src/lib/libc/include/namespace.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: namespace.h,v 1.16 2023/10/29 14:26:13 millert Exp $  */
+/*      $OpenBSD: namespace.h,v 1.17 2025/10/23 19:06:10 miod Exp $     */
 
 #ifndef _LIBC_NAMESPACE_H_
 #define _LIBC_NAMESPACE_H_
@@ -57,13 +57,13 @@
 #define DEF_WRAP(x)             __weak_alias(x, WRAP(x))
 #define DEF_SYS(x)              __strong_alias(_thread_sys_##x, HIDDEN(x))
 
-#if !defined(__clang__) && __GNUC__ != 3
+#if !defined(__clang__)
 /* our gcc 4.2 handles redirecting builtins via PROTO_NORMAL()'s asm() label */
 #define DEF_BUILTIN(x)          DEF_STRONG(x)
 #define BUILTIN
 #else
 /*
- * clang and gcc can't redirect builtins via asm() labels, so mark
+ * clang can't redirect builtins via asm() labels, so mark
  * them protected instead.
  */
 #define DEF_BUILTIN(x)          __asm("")
@@ -86,7 +86,7 @@ BUILTIN void	*memmove(void *, const void *, __size_t);
 BUILTIN void    *memcpy(void *__restrict, const void *__restrict, __size_t);
 BUILTIN void    *memset(void *, int, __size_t);
 BUILTIN void    __stack_smash_handler(const char [], int __unused);
-#if !defined(__clang__) && __GNUC__ != 3
+#if !defined(__clang__)
 PROTO_NORMAL(memmove);
 PROTO_NORMAL(memcpy);
 PROTO_NORMAL(memset);
diff --git a/src/lib/libc/include/thread_private.h b/src/lib/libc/include/thread_private.h
index 1ec1071161..3e1dbcdf6e 100644
--- a/src/lib/libc/include/thread_private.h
+++ b/src/lib/libc/include/thread_private.h
@@ -1,10 +1,13 @@
-/* $OpenBSD: thread_private.h,v 1.37 2024/08/18 02:25:51 guenther Exp $ */
+/* $OpenBSD: thread_private.h,v 1.40 2025/08/04 01:44:33 dlg Exp $ */
 
 /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
 
 #ifndef _THREAD_PRIVATE_H_
 #define _THREAD_PRIVATE_H_
 
+#include <sys/types.h>
+#include <sys/gmon.h>
+
 extern int __isthreaded;
 
 #define _MALLOC_MUTEXES 32
@@ -292,6 +295,12 @@ TAILQ_HEAD(pthread_queue, pthread);
 
 #ifdef FUTEX
 
+/*
+ * CAS based implementations
+ */
+
+#define __CMTX_CAS
+
 struct pthread_mutex {
         volatile unsigned int lock;
         int type;
@@ -312,6 +321,10 @@ struct pthread_rwlock {
 
 #else
 
+/*
+ * spinlock based implementations
+ */
+
 struct pthread_mutex {
         _atomic_lock_t lock;
         struct pthread_queue lockers;
@@ -336,6 +349,46 @@ struct pthread_rwlock {
 };
 #endif /* FUTEX */
 
+/* libc mutex */
+
+#define __CMTX_UNLOCKED         0
+#define __CMTX_LOCKED           1
+#define __CMTX_CONTENDED        2
+
+#ifdef __CMTX_CAS
+struct __cmtx {
+        volatile unsigned int   lock;
+};
+
+#define __CMTX_INITIALIZER() {                                          \
+        .lock = __CMTX_UNLOCKED,                                        \
+}
+#else /* __CMTX_CAS */
+struct __cmtx {
+        _atomic_lock_t          spin;
+        volatile unsigned int   lock;
+};
+
+#define __CMTX_INITIALIZER() {                                          \
+        .spin = _SPINLOCK_UNLOCKED,                                     \
+        .lock = __CMTX_UNLOCKED,                                        \
+}
+#endif /* __CMTX_CAS */
+
+/* libc recursive mutex */
+
+struct __rcmtx {
+        volatile pthread_t      owner;
+        struct __cmtx           mtx;
+        unsigned int            depth;
+};
+
+#define __RCMTX_INITIALIZER() {                                         \
+        .owner = NULL,                                                  \
+        .mtx = __CMTX_INITIALIZER(),                                    \
+        .depth = 0,                                                     \
+}
+
 struct pthread_mutex_attr {
         int ma_type;
         int ma_protocol;
@@ -390,6 +443,7 @@ struct pthread {
 
         /* cancel received in a delayed cancel block? */
         int delayed_cancel;
+        struct gmonparam *gmonparam;
 };
 /* flags in pthread->flags */
 #define THREAD_DONE             0x001
@@ -410,6 +464,16 @@ void	_spinlock(volatile _atomic_lock_t *);
 int     _spinlocktry(volatile _atomic_lock_t *);
 void    _spinunlock(volatile _atomic_lock_t *);
 
+void    __cmtx_init(struct __cmtx *);
+int     __cmtx_enter_try(struct __cmtx *);
+void    __cmtx_enter(struct __cmtx *);
+void    __cmtx_leave(struct __cmtx *);
+
+void    __rcmtx_init(struct __rcmtx *);
+int     __rcmtx_enter_try(struct __rcmtx *);
+void    __rcmtx_enter(struct __rcmtx *);
+void    __rcmtx_leave(struct __rcmtx *);
+
 void    _rthread_debug(int, const char *, ...)
                 __attribute__((__format__ (printf, 2, 3)));
 pid_t   _thread_dofork(pid_t (*_sys_fork)(void));
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
diff --git a/src/lib/libc/stdlib/exit.3 b/src/lib/libc/stdlib/exit.3
index 22acade86c..ccb416ee82 100644
--- a/src/lib/libc/stdlib/exit.3
+++ b/src/lib/libc/stdlib/exit.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $OpenBSD: exit.3,v 1.18 2024/08/30 03:44:48 guenther Exp $
+.\"     $OpenBSD: exit.3,v 1.19 2025/06/03 14:15:53 yasuoka Exp $
 .\"
-.Dd $Mdocdate: August 30 2024 $
+.Dd $Mdocdate: June 3 2025 $
 .Dt EXIT 3
 .Os
 .Sh NAME
@@ -54,9 +54,7 @@ Call the functions registered with the
 .Xr atexit 3
 function, in the reverse order of their registration.
 .It
-Flush all open output streams.
-.It
-Close all open streams.
+Flush and close all open streams.
 .It
 Unlink all files created with the
 .Xr tmpfile 3
@@ -79,6 +77,7 @@ function never returns.
 .Sh SEE ALSO
 .Xr _exit 2 ,
 .Xr atexit 3 ,
+.Xr fflush 3 ,
 .Xr intro 3 ,
 .Xr sysexits 3 ,
 .Xr tmpfile 3
@@ -86,7 +85,7 @@ function never returns.
 The
 .Fn exit
 function conforms to
-.St -isoC-99 .
+.St -p1003.1-2024 .
 .Sh HISTORY
 An
 .Fn exit
diff --git a/src/lib/libc/stdlib/malloc.3 b/src/lib/libc/stdlib/malloc.3
index bea5575bf8..ee13b01bd4 100644
--- a/src/lib/libc/stdlib/malloc.3
+++ b/src/lib/libc/stdlib/malloc.3
@@ -30,9 +30,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $OpenBSD: malloc.3,v 1.142 2024/08/03 20:09:24 guenther Exp $
+.\"     $OpenBSD: malloc.3,v 1.147 2025/06/04 00:38:01 yasuoka Exp $
 .\"
-.Dd $Mdocdate: August 3 2024 $
+.Dd $Mdocdate: June 4 2025 $
 .Dt MALLOC 3
 .Os
 .Sh NAME
@@ -69,7 +69,8 @@
 .Fn malloc_conceal "size_t size"
 .Ft void *
 .Fn calloc_conceal "size_t nmemb" "size_t size"
-.Vt char *malloc_options ;
+.Vt const char * const
+.Va malloc_options ;
 .Sh DESCRIPTION
 The standard functions
 .Fn malloc ,
@@ -268,7 +269,15 @@ next checks the environment for a variable called
 and finally looks at the global variable
 .Va malloc_options
 in the program.
-Each is scanned for the flags documented below.
+Since
+.Fn malloc
+might already get called before the beginning of
+.Fn main ,
+either initialize
+.Va malloc_options
+to a string literal at file scope or do not declare it at all.
+.Pp
+Each of the three strings is scanned for the flags documented below.
 Unless otherwise noted uppercase means on, lowercase means off.
 During initialization, flags occurring later modify the behaviour
 that was requested by flags processed earlier.
@@ -363,18 +372,9 @@ Use with
 to get a verbose dump of malloc's internal state.
 .It Cm X
 .Dq xmalloc .
-Rather than return failure,
+Rather than return failure to handle out-of-memory conditions gracefully,
 .Xr abort 3
 the program with a diagnostic message on stderr.
-It is the intention that this option be set at compile time by
-including in the source:
-.Bd -literal -offset indent
-extern char *malloc_options;
-malloc_options = "X";
-.Ed
-.Pp
-Note that this will cause code that is supposed to handle
-out-of-memory conditions gracefully to abort instead.
 .It Cm <
 .Dq Halve the cache size .
 Decrease the size of the free page cache by a factor of two.
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index cad8e5d6a1..f067dd1f37 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: malloc.c,v 1.297 2024/09/20 02:00:46 jsg Exp $        */
+/*      $OpenBSD: malloc.c,v 1.300 2025/10/23 18:49:46 miod Exp $       */
 /*
  * Copyright (c) 2008, 2010, 2011, 2016, 2023 Otto Moerbeek <otto@drijf.net>
  * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -31,7 +31,6 @@
 #include <sys/queue.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
-#include <uvm/uvmexp.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdint.h>
@@ -264,7 +263,8 @@ static union {
                 __attribute__((section(".openbsd.mutable")));
 #define mopts   malloc_readonly.mopts
 
-char            *malloc_options;        /* compile-time options */
+/* compile-time options */
+const char *const malloc_options __attribute__((weak));
 
 static __dead void wrterror(struct dir_info *d, char *msg, ...)
     __attribute__((__format__ (printf, 2, 3)));
@@ -501,7 +501,8 @@ omalloc_parseopt(char opt)
 static void
 omalloc_init(void)
 {
-        char *p, *q, b[16];
+        const char *p;
+        char *q, b[16];
         int i, j;
         const int mib[2] = { CTL_VM, VM_MALLOC_CONF };
         size_t sb;
@@ -1090,24 +1091,6 @@ err:
         return NULL;
 }
 
-#if defined(__GNUC__) && __GNUC__ < 4
-static inline unsigned int
-lb(u_int x)
-{
-#if defined(__m88k__)
-        __asm__ __volatile__ ("ff1 %0, %0" : "=r" (x) : "0" (x));
-        return x;
-#else
-        /* portable version */
-        unsigned int count = 0;
-        while ((x & (1U << (sizeof(int) * CHAR_BIT - 1))) == 0) {
-                count++;
-                x <<= 1;
-        }
-        return (sizeof(int) * CHAR_BIT - 1) - count;
-#endif
-}
-#else
 /* using built-in function version */
 static inline unsigned int
 lb(u_int x)
@@ -1115,7 +1098,6 @@ lb(u_int x)
         /* I need an extension just for integer-length (: */
         return (sizeof(int) * CHAR_BIT - 1) - __builtin_clz(x);
 }
-#endif
 
 /* https://pvk.ca/Blog/2015/06/27/linear-log-bucketing-fast-versatile-simple/
    via Tony Finch */
diff --git a/src/lib/libc/stdlib/mkstemp.c b/src/lib/libc/stdlib/mkstemp.c
index 75a9d27d1a..760575005f 100644
--- a/src/lib/libc/stdlib/mkstemp.c
+++ b/src/lib/libc/stdlib/mkstemp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mkstemp.c,v 1.1 2024/01/19 19:45:02 millert Exp $ */
+/*      $OpenBSD: mkstemp.c,v 1.2 2025/08/04 04:59:31 guenther Exp $ */
 /*
  * Copyright (c) 2024 Todd C. Miller
  *
@@ -20,7 +20,8 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#define MKOSTEMP_FLAGS  (O_APPEND | O_CLOEXEC | O_DSYNC | O_RSYNC | O_SYNC)
+#define MKOSTEMP_FLAGS \
+        (O_APPEND | O_CLOEXEC | O_CLOFORK | O_DSYNC | O_RSYNC | O_SYNC)
 
 static int
 mkstemp_cb(const char *path, int flags)
diff --git a/src/lib/libc/stdlib/mktemp.3 b/src/lib/libc/stdlib/mktemp.3
index 83b7c9eb30..a967358164 100644
--- a/src/lib/libc/stdlib/mktemp.3
+++ b/src/lib/libc/stdlib/mktemp.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: mktemp.3,v 1.2 2024/03/01 21:30:40 millert Exp $
+.\"     $OpenBSD: mktemp.3,v 1.4 2025/08/04 14:11:37 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -27,17 +27,17 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 1 2024 $
+.Dd $Mdocdate: August 4 2025 $
 .Dt MKTEMP 3
 .Os
 .Sh NAME
 .Nm mktemp ,
 .Nm mkstemp ,
-.Nm mkostemp ,
 .Nm mkstemps ,
-.Nm mkostemps ,
 .Nm mkdtemp ,
-.Nm mkdtemps
+.Nm mkdtemps ,
+.Nm mkostemp ,
+.Nm mkostemps
 .Nd make temporary file name (unique)
 .Sh SYNOPSIS
 .In stdlib.h
@@ -119,6 +119,8 @@ system call:
 Append on each write.
 .It Dv O_CLOEXEC
 Set the close-on-exec flag on the new file descriptor.
+.It Dv O_CLOFORK
+Set the close-on-fork flag on the new file descriptor.
 .It Dv O_SYNC
 Perform synchronous I/O operations.
 .El
@@ -163,8 +165,8 @@ functions return a pointer to the template on success and
 on failure.
 The
 .Fn mkstemp ,
-.Fn mkostemp ,
 .Fn mkstemps ,
+.Fn mkostemp ,
 and
 .Fn mkostemps
 functions return \-1 if no suitable file could be created.
@@ -253,9 +255,9 @@ of
 The
 .Fn mktemp ,
 .Fn mkstemp ,
-.Fn mkostemp ,
+.Fn mkdtemp ,
 and
-.Fn mkdtemp
+.Fn mkostemp
 functions may set
 .Va errno
 to one of the following values:
@@ -318,8 +320,8 @@ function.
 .Pp
 The
 .Fn mkstemp ,
-.Fn mkostemp ,
 .Fn mkstemps ,
+.Fn mkostemp ,
 and
 .Fn mkostemps
 functions may also set
@@ -345,18 +347,16 @@ function.
 .Xr tmpnam 3
 .Sh STANDARDS
 The
-.Fn mkdtemp
+.Fn mkstemp ,
+.Fn mkdtemp ,
 and
-.Fn mkstemp
+.Fn mkostemp
 functions conform to the
-.St -p1003.1-2008
+.St -p1003.1-2024
 specification.
 The ability to specify more than six
 .Em X Ns s
 is an extension to that standard.
-The
-.Fn mkostemp
-function is expected to conform to a future revision of that standard.
 .Pp
 The
 .Fn mktemp
@@ -368,9 +368,9 @@ it is no longer a part of the standard.
 .Pp
 The
 .Fn mkstemps ,
-.Fn mkostemps ,
+.Fn mkdtemps ,
 and
-.Fn mkdtemps
+.Fn mkostemps
 functions are non-standard and should not be used if portability is required.
 .Sh HISTORY
 A
@@ -378,14 +378,14 @@ A
 function appeared in
 .At v7 .
 The
-.Fn mkdtemp
-function appeared in
-.Ox 2.2 .
-The
 .Fn mkstemp
 function appeared in
 .Bx 4.3 .
 The
+.Fn mkdtemp
+function appeared in
+.Ox 2.2 .
+The
 .Fn mkstemps
 function appeared in
 .Ox 2.3 .
diff --git a/src/lib/libc/stdlib/ptsname.3 b/src/lib/libc/stdlib/ptsname.3
index 98705528f5..eea36a5a02 100644
--- a/src/lib/libc/stdlib/ptsname.3
+++ b/src/lib/libc/stdlib/ptsname.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ptsname.3,v 1.2 2012/12/04 18:42:16 millert Exp $
+.\"     $OpenBSD: ptsname.3,v 1.3 2025/06/13 18:34:00 schwarze Exp $
 .\"
 .\" Copyright (c) 2002 The FreeBSD Project, Inc.
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD: head/lib/libc/stdlib/ptsname.3 240412 2012-09-12 17:54:09Z emaste $
 .\"
-.Dd $Mdocdate: December 4 2012 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt PTSNAME 3
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .In stdlib.h
 .Ft int
 .Fn grantpt "int fildes"
-.Ft "char *"
+.Ft char *
 .Fn ptsname "int fildes"
 .Ft int
 .Fn unlockpt "int fildes"
diff --git a/src/lib/libc/stdlib/rand48.3 b/src/lib/libc/stdlib/rand48.3
index fa7a7179bc..02e1999db9 100644
--- a/src/lib/libc/stdlib/rand48.3
+++ b/src/lib/libc/stdlib/rand48.3
@@ -9,9 +9,9 @@
 .\" of any kind. I shall in no event be liable for anything that happens
 .\" to anyone/anything when using this software.
 .\"
-.\"     $OpenBSD: rand48.3,v 1.21 2019/12/20 19:16:40 tb Exp $
+.\"     $OpenBSD: rand48.3,v 1.22 2025/06/13 18:34:00 schwarze Exp $
 .\"
-.Dd $Mdocdate: December 20 2019 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt DRAND48 3
 .Os
 .Sh NAME
@@ -46,9 +46,9 @@
 .Fn srand48 "long seed"
 .Ft void
 .Fn srand48_deterministic "long seed"
-.Ft "unsigned short *"
+.Ft unsigned short *
 .Fn seed48 "unsigned short xseed[3]"
-.Ft "unsigned short *"
+.Ft unsigned short *
 .Fn seed48_deterministic "unsigned short xseed[3]"
 .Ft void
 .Fn lcong48 "unsigned short p[7]"
diff --git a/src/lib/libc/stdlib/realpath.3 b/src/lib/libc/stdlib/realpath.3
index 1dec10fef4..1f932e3bb5 100644
--- a/src/lib/libc/stdlib/realpath.3
+++ b/src/lib/libc/stdlib/realpath.3
@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $OpenBSD: realpath.3,v 1.26 2021/10/13 15:04:53 kn Exp $
+.\"     $OpenBSD: realpath.3,v 1.27 2025/06/13 18:34:00 schwarze Exp $
 .\"
-.Dd $Mdocdate: October 13 2021 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt REALPATH 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Sh SYNOPSIS
 .In limits.h
 .In stdlib.h
-.Ft "char *"
+.Ft char *
 .Fn realpath "const char *pathname" "char *resolved"
 .Sh DESCRIPTION
 The
diff --git a/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc
index 204ca1b266..f8b6330453 100644
--- a/src/lib/libc/string/Makefile.inc
+++ b/src/lib/libc/string/Makefile.inc
@@ -1,13 +1,13 @@
-#       $OpenBSD: Makefile.inc,v 1.40 2024/07/14 09:51:18 jca Exp $
+#       $OpenBSD: Makefile.inc,v 1.41 2025/10/24 11:30:06 claudio Exp $
 
 # string sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string
 
-SRCS+=  explicit_bzero.c memccpy.c memmem.c memrchr.c stpcpy.c stpncpy.c \
-        strcasecmp.c strcasecmp_l.c strcasestr.c strcoll.c strcoll_l.c \
-        strdup.c strerror.c strerror_l.c strerror_r.c strmode.c \
-        strndup.c strnlen.c strsignal.c strtok.c strxfrm.c strxfrm_l.c \
-        timingsafe_bcmp.c timingsafe_memcmp.c \
+SRCS+=  explicit_bzero.c ffsl.c ffsll.c memccpy.c memmem.c memrchr.c \
+        stpcpy.c stpncpy.c strcasecmp.c strcasecmp_l.c strcasestr.c \
+        strcoll.c strcoll_l.c strdup.c strerror.c strerror_l.c strerror_r.c \
+        strmode.c strndup.c strnlen.c strsignal.c strtok.c strxfrm.c \
+        strxfrm_l.c timingsafe_bcmp.c timingsafe_memcmp.c \
         wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c wcslcat.c wcslcpy.c \
         wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcsnlen.c wcspbrk.c wcsrchr.c \
         wcsspn.c wcsstr.c wcstok.c wcswcs.c wcswidth.c wmemchr.c wmemcmp.c \
diff --git a/src/lib/libc/string/ffs.3 b/src/lib/libc/string/ffs.3
index e78ab99e8f..0b78fbfd33 100644
--- a/src/lib/libc/string/ffs.3
+++ b/src/lib/libc/string/ffs.3
@@ -27,24 +27,33 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $OpenBSD: ffs.3,v 1.11 2019/08/30 18:35:03 deraadt Exp $
+.\"     $OpenBSD: ffs.3,v 1.13 2025/11/06 17:19:11 schwarze Exp $
 .\"
-.Dd $Mdocdate: August 30 2019 $
+.Dd $Mdocdate: November 6 2025 $
 .Dt FFS 3
 .Os
 .Sh NAME
-.Nm ffs
+.Nm ffs ,
+.Nm ffsl ,
+.Nm ffsll
 .Nd find first bit set in a bit string
 .Sh SYNOPSIS
 .In strings.h
 .Ft int
 .Fn ffs "int value"
+.Ft int
+.Fn ffsl "long value"
+.Ft int
+.Fn ffsll "long long value"
 .Sh DESCRIPTION
 The
-.Fn ffs
-function finds the first bit set in
+.Fn ffs ,
+.Fn ffsl ,
+and
+.Fn ffsll
+functions find the first bit set in
 .Fa value
-and returns the index of that bit.
+and return the index of that bit.
 Bits are numbered starting from 1, starting at the rightmost bit.
 A return value of 0 means that the argument was zero.
 .Sh SEE ALSO
@@ -54,8 +63,20 @@ The
 .Fn ffs
 function conforms to
 .St -p1003.1-2008 .
+The
+.Fn ffsl
+and
+.Fn ffsll
+functions conform to
+.St -p1003.1-2024 .
 .Sh HISTORY
 The
 .Fn ffs
 function first appeared in
 .Bx 4.2 .
+The
+.Fn ffsl
+and
+.Fn ffsll
+functions first appeared in
+.Ox 7.9 .
diff --git a/src/lib/libc/string/ffsl.c b/src/lib/libc/string/ffsl.c
new file mode 100644
index 0000000000..182318c3d6
--- /dev/null
+++ b/src/lib/libc/string/ffsl.c
@@ -0,0 +1,17 @@
+/*      $OpenBSD: ffsl.c,v 1.1 2025/10/24 11:30:06 claudio Exp $        */
+
+/*
+ * Public domain.
+ * Written by Claudio Jeker.
+ */
+
+#include <strings.h>
+
+/*
+ * ffs -- find the first (least significant) bit set
+ */
+int
+ffsl(long mask)
+{
+        return (mask ? __builtin_ctzl(mask) + 1 : 0);
+}
diff --git a/src/lib/libc/string/ffsll.c b/src/lib/libc/string/ffsll.c
new file mode 100644
index 0000000000..9370c5ae41
--- /dev/null
+++ b/src/lib/libc/string/ffsll.c
@@ -0,0 +1,17 @@
+/*      $OpenBSD: ffsll.c,v 1.1 2025/10/24 11:30:06 claudio Exp $       */
+
+/*
+ * Public domain.
+ * Written by Claudio Jeker.
+ */
+
+#include <strings.h>
+
+/*
+ * ffs -- find the first (least significant) bit set
+ */
+int
+ffsll(long long mask)
+{
+        return (mask ? __builtin_ctzll(mask) + 1 : 0);
+}
diff --git a/src/lib/libc/string/memmem.3 b/src/lib/libc/string/memmem.3
index de62d738de..eeb621f8f6 100644
--- a/src/lib/libc/string/memmem.3
+++ b/src/lib/libc/string/memmem.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: memmem.3,v 1.4 2024/08/03 20:13:23 guenther Exp $
+.\"     $OpenBSD: memmem.3,v 1.5 2025/06/13 18:34:00 schwarze Exp $
 .\"
 .\" Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
 .\"
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 3 2024 $
+.Dd $Mdocdate: June 13 2025 $
 .Dt MEMMEM 3
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Nd locate a byte substring in a byte string
 .Sh SYNOPSIS
 .In string.h
-.Ft "void *"
+.Ft void *
 .Fo memmem
 .Fa "const void *big" "size_t big_len"
 .Fa "const void *little" "size_t little_len"