FreeBSD/src 09935bfsys/fs/tmpfs tmpfs_vfsops.c

tmpfs: Overhaul option handling on remount

On remount, we must accept all the same options as on initial mount.
For parameters which we're unable to modify on the fly, fail only if
the new value is different from the existing one.

PR:             295096
MFC after:      1 week
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57044

(cherry picked from commit 1cfc208a07b64a64377a4f8fe51c28f588a929cf)
DeltaFile
+62-38sys/fs/tmpfs/tmpfs_vfsops.c
+62-381 files

FreeBSD/src 0f4fd69sys/fs/tmpfs tmpfs_vfsops.c

tmpfs: Overhaul option handling on remount

On remount, we must accept all the same options as on initial mount.
For parameters which we're unable to modify on the fly, fail only if
the new value is different from the existing one.

PR:             295096
MFC after:      1 week
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57044

(cherry picked from commit 1cfc208a07b64a64377a4f8fe51c28f588a929cf)
DeltaFile
+62-38sys/fs/tmpfs/tmpfs_vfsops.c
+62-381 files

FreeBSD/src f3ded0fshare/man/man4 tcp.4, sys/netinet tcp_timewait.c tcp_var.h

tcp: Make RFC 6191 support configurable

Add a default-on per-VIMAGE sysctl for RFC 6191 connection recycling.
This makes it possible to merge the change to older branches where it
can be switched off by default to minimize risk.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   Modirum MDPay
Reviewed by:    pouria, marius.h_lden.org, tuexen
Differential Revision:  https://reviews.freebsd.org/D57045

(cherry picked from commit 2af70d7a384934cee497fb6d75678e04f1416287)

tcp: Fix typo in RFC 6191 sysctl

Fixes:          2af70d7a3849 ("tcp: Make RFC 6191 support configurable")
MFC after:      1 week
Sponsored by:   Klara, Inc.

    [3 lines not shown]
DeltaFile
+37-21sys/netinet/tcp_timewait.c
+10-1share/man/man4/tcp.4
+2-0sys/netinet/tcp_var.h
+49-223 files

FreeBSD/src d2c2193stand/i386/pxeldr pxeboot.8, stand/libsa rpc.c

pxeboot: warn and abort on TCP-only NFS server, which doesn't work for pxeboot

When pxeboot gets a 0 as a port number from portmapper (indicating an
error), it currently happily sends NFS packets to the server's port 0
in an endless loop. Change this to instead bail out with a useful
message.

This happens, for example, with recent Linux NFS servers as many
distributions switched to TCP only NFS serving by default. FreeBSD's
pxeboot must have UDP. In this situation pxeboot asks the server's
portmapper for the UDP NFS port and since there is none gets 0.

Also add a hint to the manpage explaining this and how to fix it.

Reviewed by: ziaee, kevans, imp
DeltaFile
+8-0stand/i386/pxeldr/pxeboot.8
+5-0stand/libsa/rpc.c
+13-02 files

FreeBSD/src 11d69a4share/man/man4 linuxkpi_wlan.4, sys/compat/linuxkpi/common/src linuxkpi_80211_pm.c linux_80211.c

LinuxKPI: 802.11: add support for suspend/resume

Add support for automatic suspend/resume as we know it for wireless.
The problem is that the PCI driver which would normally gets the code
is the LinuxKPI PCI framework/Linux wireless driver, which we cannot
ammend or generally add extra suspend/resume code to.
A further problem is that with growing support, the LinuxKPI 802.11
(mac80211) layer also is involved in suspend/resume for WoWLAN (not
yet supported) meaning that we need to hook the suspend/resume
framework into that as well.  Unlike Linux we do not have a general
suspend/resume "hook" we can hang into and we need to tie this one
to the hardware so cannot indepedently (after the driver one) run it.

The solution for FreeBSD, in order to not mangle the Linux native
drivers and get extra maintanace overhead, is to add a bus child
which inherits the general framework and thus is 2 lines + #includes
for each driver extra to add to.

The general suspend/resume framework lives in LinuxKPI (linuxkpi_80211_pm)

    [35 lines not shown]
DeltaFile
+214-0sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c
+137-0sys/compat/linuxkpi/common/src/linux_80211.c
+116-0sys/compat/linuxkpi/common/src/linux_80211_macops.c
+15-1sys/compat/linuxkpi/common/src/linux_80211.h
+7-1share/man/man4/linuxkpi_wlan.4
+8-0sys/contrib/dev/rtw88/lkpi_rtw88_pm.c
+497-27 files not shown
+521-413 files

FreeBSD/src 8ead192sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: reset chanctx when recycling

When we no longer need a channel context and put it back on the
reserved list, zero it for all but the vif so that we get the same
state as if it was freshly allocated.

Sponsored by:   The FreeBSD Foundation
Fixes:          e62c92c0a5cf, 88cb1e17f471
MFC after:      3 days
DeltaFile
+5-0sys/compat/linuxkpi/common/src/linux_80211.c
+5-01 files

FreeBSD/src 4d125edsys/netlink netlink_generic.c

netlink: Avoid potential undefined behaviour

Taking the address of an OOB array element is UB, even if not
dereferenced.

Reviewed by: des, bz
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57172
DeltaFile
+3-5sys/netlink/netlink_generic.c
+3-51 files

FreeBSD/src 9f1e693usr.sbin/mfiutil mfiutil.8

mfiutil.8/mrsasutil.8: Use Broadcom/LSI consistently

Both tools support controllers from both companies, so document it.

Reviewed by:    ziaee (via IRC)
MFC after:      immediately
Differential Revision:  https://reviews.freebsd.org/D57212

(cherry picked from commit c74645b0c8df1307cb6f13d835012f88883dff3a)
DeltaFile
+3-3usr.sbin/mfiutil/mfiutil.8
+3-31 files

FreeBSD/src 54c8439share/man/man4 mrsas.4

mrsas.4: Use Broadcom/LSI consistently

Reviewed by:    ziaee (via IRC)
MFC after:      immediately
Differential Revision:  https://reviews.freebsd.org/D57211

(cherry picked from commit f30b1df048f00cd84f46b798c67234e7c3009962)
DeltaFile
+2-2share/man/man4/mrsas.4
+2-21 files

FreeBSD/src 71c50c1usr.sbin/mfiutil mfiutil.8

mfiutil.8/mrsasutil.8: Use Broadcom/LSI consistently

Both tools support controllers from both companies, so document it.

Reviewed by:    ziaee (via IRC)
MFC after:      immediately
Differential Revision:  https://reviews.freebsd.org/D57212

(cherry picked from commit c74645b0c8df1307cb6f13d835012f88883dff3a)
DeltaFile
+3-3usr.sbin/mfiutil/mfiutil.8
+3-31 files

FreeBSD/src ce40d96share/man/man4 mrsas.4

mrsas.4: Use Broadcom/LSI consistently

Reviewed by:    ziaee (via IRC)
MFC after:      immediately
Differential Revision:  https://reviews.freebsd.org/D57211

(cherry picked from commit f30b1df048f00cd84f46b798c67234e7c3009962)
DeltaFile
+2-2share/man/man4/mrsas.4
+2-21 files

FreeBSD/src c74645busr.sbin/mfiutil mfiutil.8

mfiutil.8/mrsasutil.8: Use Broadcom/LSI consistently

Both tools support controllers from both companies, so document it.

Reviewed by:    ziaee (via IRC)
MFC after:      immediately
Differential Revision:  https://reviews.freebsd.org/D57212
DeltaFile
+3-3usr.sbin/mfiutil/mfiutil.8
+3-31 files

FreeBSD/src f30b1dfshare/man/man4 mrsas.4

mrsas.4: Use Broadcom/LSI consistently

Reviewed by:    ziaee (via IRC)
MFC after:      immediately
Differential Revision:  https://reviews.freebsd.org/D57211
DeltaFile
+2-2share/man/man4/mrsas.4
+2-21 files

FreeBSD/src 1df4315bin/sh/tests/builtins read12.0 read11.0

sh/tests: Cut down builtins/read12.0 by 2 seconds

Since the test assumes a 250 ms response time, there is no need to delay
for 3 seconds. Instead, delay for the minimum possible 1 second.

Also, fix some assertions in builtins/read11.0 and builtins/read12.0. If
`set -e` is in effect, `foo` in `foo && bar` is considered tested and
therefore a failure does not cause the shell to exit.

Reviewed by:    bdrewery
Differential Revision:  https://reviews.freebsd.org/D55191
DeltaFile
+8-6bin/sh/tests/builtins/read12.0
+2-1bin/sh/tests/builtins/read11.0
+10-72 files

FreeBSD/src 1dbc104sys/netlink netlink_message_parser.c, sys/netlink/route rt.c iface_drivers.c

netlink: Check for NULL return from npt_alloc()

Reviewed by: glebius, pouria
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57171
DeltaFile
+4-0sys/netlink/route/rt.c
+3-0sys/netlink/route/iface_drivers.c
+2-0sys/netlink/netlink_message_parser.c
+9-03 files

FreeBSD/src 65e0c7finclude unistd.h, lib/libc/gen freadlink.c Makefile.inc

libc: add freadlink(3)

(cherry picked from commit a2e0822543e93a8d815acd2d1c3d51ef73d6e262)
DeltaFile
+16-0lib/libc/gen/freadlink.c
+1-0include/unistd.h
+1-0lib/libc/gen/Makefile.inc
+1-0lib/libc/gen/Symbol.map
+19-04 files

FreeBSD/src 6646f95sys/ufs/ufs ufs_bmap.c

ufs: support unmapped bufs for indirect blocks in bmap

(cherry picked from commit bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d)
DeltaFile
+134-9sys/ufs/ufs/ufs_bmap.c
+134-91 files

FreeBSD/src 5246249sys/compat/linux linux_common.h

linux/linux_common.h: make header self-contained

(cherry picked from commit f6f5eb3190165cea4470048809413b1fdbd97e04)
DeltaFile
+6-0sys/compat/linux/linux_common.h
+6-01 files

FreeBSD/src c1d05b8sys/sys fcntl.h

Add O_SYMLINK emulation

(cherry picked from commit 428da7d65b1c41c81a8786f66c1ce2f4242ac8bb)
DeltaFile
+7-0sys/sys/fcntl.h
+7-01 files

FreeBSD/src b393aa8sys/fs/nullfs null_vfsops.c

nullfs: do not allow to mount a vnode over itself

PR:     275570

(cherry picked from commit 7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0)
DeltaFile
+8-0sys/fs/nullfs/null_vfsops.c
+8-01 files

FreeBSD/src a0fb45esys/kern kern_umtx.c

kern_umtx.c: remove dead code

(cherry picked from commit d9c31658df8492a5666e799c2b267c425cb8f468)
DeltaFile
+6-11sys/kern/kern_umtx.c
+6-111 files

FreeBSD/src 3564e33sys/ufs/ufs ufs_bmap.c

ufs: ufs_bmap_seekdata() needs mapped buffer for scan

PR:     295348

(cherry picked from commit 8ad8643a66735d28dac53a772856c94ca65b2bf3)
DeltaFile
+7-4sys/ufs/ufs/ufs_bmap.c
+7-41 files

FreeBSD/src 50caa0econtrib/unbound ltmain.sh configure, contrib/unbound/util configparser.c

unbound: Update to 1.25.1

Release notes at
        https://nlnetlabs.nl/news/2026/May/20/unbound-1.25.1-released/

Merge commit '22e58f330a151944c24e010d23ec3881df6681b6'

Security:       CVE-2026-33278
Security:       CVE-2026-42944
Security:       CVE-2026-42959
Security:       CVE-2026-32792
Security:       CVE-2026-40622
Security:       CVE-2026-41292
Security:       CVE-2026-42534
Security:       CVE-2026-42923
Security:       CVE-2026-42960
Security:       CVE-2026-44390
Security:       CVE-2026-44608
MFC after:      1 week
DeltaFile
+969-601contrib/unbound/ltmain.sh
+1,129-366contrib/unbound/configure
+425-471contrib/unbound/util/configparser.c
+509-348contrib/unbound/aclocal.m4
+108-68contrib/unbound/install-sh
+71-5contrib/unbound/validator/val_nsec3.c
+3,211-1,85934 files not shown
+3,403-1,93140 files

FreeBSD/src 5fa84c6contrib/unbound configure, contrib/unbound/pythonmod interface.i

unbound: Update to 1.25.0

Release notes at
        https://nlnetlabs.nl/news/2026/Apr/29/unbound-1.25.0-released/

Merge commit '4dd0a17edce60370304a45f2c40251e09e193bd6'

MFC after:      1 week
DeltaFile
+3,982-3,941contrib/unbound/util/configlexer.c
+2,504-3,790contrib/unbound/configure
+2,396-2,294contrib/unbound/util/configparser.c
+0-2,764contrib/unbound/testcode/doqclient.c
+0-2,044contrib/unbound/testcode/fake_event.c
+0-1,857contrib/unbound/pythonmod/interface.i
+8,882-16,690132 files not shown
+15,803-27,136138 files

FreeBSD/src b133353sys/amd64/vmm/io ppt.c

amd64/vmm: Fix ppt_unmap_mmio() after commit 36b855f18925

Fixes:          36b855f18925 ("amd64/vmm: Lock global PCI passthrough structures")
MFC after:      3 days
Reported by:    bz
DeltaFile
+1-1sys/amd64/vmm/io/ppt.c
+1-11 files

FreeBSD/src c783d71usr.sbin/syslogd syslogd_cap_log.c

syslogd: fix memory leak in casper_ttymsg()

nvlist_take_string_array(9) takes ownership of the array and its
strings. casper_ttymsg() freed neither, leaking memory on every
F_CONSOLE and F_TTY message. On long-running systems with high
error-rate syslog traffic routed to /dev/console, syslogd.casper grew
to hundreds of MB.

Use nvlist_get_string_array(9) to borrow the array instead. Update
casper_wallmsg() similarly.

Approved by:    src (des)
Closes:         https://github.com/freebsd/freebsd-src/pull/2222
Fixes:          61a29eca550b ("syslogd: Log messages using libcasper")
MFC after:      3 days
MFC to:         stable/15
PR:             295488
Reported by:    Pat Maddox <pat at patmaddox.com>
Reviewed by:    markj
Tested by:      dch
DeltaFile
+6-8usr.sbin/syslogd/syslogd_cap_log.c
+6-81 files

FreeBSD/src 22fa41bcontrib/unbound configure config.h.in, contrib/unbound/doc unbound-host.1.in libunbound.3

unbound: Update to 1.24.2

Merge commit 'ec5b94f552d7cb2a9d456c67e9941bcf5e3698bf'

This is purely cosmetic as we already had the functional changes.

MFC after:      1 week
DeltaFile
+2,692-1,909contrib/unbound/configure
+8-8lib/libunbound/config.h
+5-5contrib/unbound/config.h.in
+2-2contrib/unbound/doc/unbound-host.1.in
+2-2contrib/unbound/doc/libunbound.3
+2-2contrib/unbound/doc/libunbound.3.in
+2,711-1,92815 files not shown
+2,738-1,95421 files

FreeBSD/src 290190bcontrib/unbound/doc unbound.conf.5 unbound-control.8

unbound: Regenerate for 1.24.1

No functional changes intended.

Fixes:          8b29c373e6ab ("unbound: Vendor import 1.24.1")
DeltaFile
+5,042-2,546contrib/unbound/doc/unbound.conf.5
+1,203-637contrib/unbound/doc/unbound-control.8
+330-343contrib/unbound/doc/libunbound.3
+245-134contrib/unbound/doc/unbound-anchor.8
+157-85contrib/unbound/doc/unbound-host.1
+102-67contrib/unbound/doc/unbound.8
+7,079-3,8123 files not shown
+7,184-3,8669 files

FreeBSD/src cd69bc0contrib/unbound freebsd-configure.sh

unbound: Tweak freebsd-configure script

Regenerating the configure script is optional and can introduce noise
if the installed versions of autoconf, automake, and libtool do not
match those used upstream.  Tweak our script slightly so it will skip
this step if libtoolize is not found.
DeltaFile
+1-1contrib/unbound/freebsd-configure.sh
+1-11 files

FreeBSD/src dd64155contrib/ldns sha2.c

ldns: Fix unused variable on big-endian

MFC after:      1 week
Fixes:          9ed998a81bab ("ldns: Update to 1.9.0")
DeltaFile
+2-0contrib/ldns/sha2.c
+2-01 files