FreeBSD/src ef66e13lib/libsysdecode utrace.c, libexec/rtld-elf rtld.c rtld_utrace.h

rtld: silence clang's unterminated-string-initialization warning

Since the initializer is used in other places where we can't just
replace it with a char-by-char initializer, this adds a macro for the
nonstring attribute (match the linuxkpi definition).

Reviewed by:    emaste, jhb
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D52535

(cherry picked from commit 86f325711c07b723b85c031d581d0a5c1a0964f3)
DeltaFile
+2-1libexec/rtld-elf/rtld.c
+2-1lib/libsysdecode/utrace.c
+1-1libexec/rtld-elf/rtld_utrace.h
+5-33 files

FreeBSD/src 3118f1bsys/dev/bnxt/bnxt_en bnxt_sriov.c bnxt_sriov.h

bnxt: Fix build / load error for bnxt(4) in kernels without PCI_IOV

This change removes the hard-forcing of  PCI_IOV and adds shims to
allow the driver to compile and work when the kernel is missing
PCI_IOV support.

Fixes: 7c450d1127c7
Reviewed by: sumit.saxena_broadcom.com
Differential Revision: https://reviews.freebsd.org/D57300
Sponsored by: Netflix
DeltaFile
+39-0sys/dev/bnxt/bnxt_en/bnxt_sriov.c
+0-4sys/dev/bnxt/bnxt_en/bnxt_sriov.h
+0-2sys/dev/bnxt/bnxt_en/if_bnxt.c
+39-63 files

FreeBSD/src ec6249flib/libfetch common.c

libfetch: Fix -Wunterminated-string-initialization

This defaults to an error in clang HEAD, use a char-by-char
initializer instead.

Reviewed by:    emaste, jhb
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D52532

(cherry picked from commit 79f578531f21aa57307cbffd858a8a89e562aa5c)
DeltaFile
+1-1lib/libfetch/common.c
+1-11 files

FreeBSD/src 311576cshare/mk bsd.sys.mk

bsd.sys.mk: suppress some clang warnings for C++ for >= 19

I just tried building with system clang on one of my Linux systems which
happens to be version 19, and these warning suppressions are needed for
that version too: same errors as in the original commit.

Reviewed by:    imp
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D56874

(cherry picked from commit 004b5935a6e643033526cab623c6005b69ab11aa)
DeltaFile
+0-2share/mk/bsd.sys.mk
+0-21 files

FreeBSD/src 3289a84lib/libthr/thread thr_printf.c

libthr: fix -Wunterminated-string-initialization

Reviewed by:    jhb, emaste
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D52528

(cherry picked from commit 4cfc7de13f110563463c15be99690c6fe7b8676a)
DeltaFile
+1-2lib/libthr/thread/thr_printf.c
+1-21 files

FreeBSD/src 4a192f8sbin/devd snd.conf

sbin/devd/snd.conf: Add missing -n options to sysrc calls

Reviewed by:    christos
Fixes:          70e27ecba518 (virtual_oss: Introduce virtual_oss_default_control_device rc variable)
Sponsored by:   The FreeBSD Foundation
Pull Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/36

(cherry picked from commit bc2055b94576078453b372f537ef40bc4e3c18e4)
DeltaFile
+3-3sbin/devd/snd.conf
+3-31 files

FreeBSD/src 6272ef2sys/dev/sound/pcm dsp.c

sound: Remove SV_ABI_LINUX ifdef

This ifdef does not do anything, SV_ABI_LINUX is a flag.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    ivy, brooks
Pull-Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/37

(cherry picked from commit 3a3b0545913625360e38b30dba10c74dae71bbcc)
DeltaFile
+0-6sys/dev/sound/pcm/dsp.c
+0-61 files

FreeBSD/src d2e63a0sbin/ipfw nat.c ipfw.8, tests/sys/netpfil/common nat.sh

ipfw: fix parsing error in nat config port_range

Also fix the corresponding tests.

PR:             263240
Differential Revision:  https://reviews.freebsd.org/D57010

(cherry picked from commit 6eba055fcf5b0bbfbebcac59f5982d13815001b0)
DeltaFile
+16-13sbin/ipfw/nat.c
+14-12tests/sys/netpfil/common/nat.sh
+2-1sbin/ipfw/ipfw.8
+32-263 files

FreeBSD/src 33cafd3sbin/ipfw nat.c ipfw.8, tests/sys/netpfil/common nat.sh

ipfw: fix parsing error in nat config port_range

Also fix the corresponding tests.

PR:             263240
Differential Revision:  https://reviews.freebsd.org/D57010

(cherry picked from commit 6eba055fcf5b0bbfbebcac59f5982d13815001b0)
DeltaFile
+16-13sbin/ipfw/nat.c
+14-12tests/sys/netpfil/common/nat.sh
+2-1sbin/ipfw/ipfw.8
+32-263 files

FreeBSD/src 283959busr.sbin/bsdinstall/scripts script

bsdinstall: script: Fix scripted DISTRIBUTIONS

Restore exporting DISTRIBUTIONS to make it available to other scripts.

Reviewed by:    imp, asomers
Fixes:          dc14ae4217a0 ("bsdinstall: do pkgbase installations with the "script" command")
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D57319
DeltaFile
+1-0usr.sbin/bsdinstall/scripts/script
+1-01 files

FreeBSD/src f841f71sys/conf newvers.sh

15.1: Update to RC2

Approved by:    re (implicit)
Sponsored by:   OpenSats Initiative
DeltaFile
+1-1sys/conf/newvers.sh
+1-11 files

FreeBSD/src 191573cshare/man/man4 Makefile, sys/amd64/conf GENERIC

padlock: Restore padlock_rng to the amd64 build

Revert 88a53301e19 and d1ca01059d5 .  They removed padlock_rng from the
amd64 build under the mistaken belief that this device was available on
32-bit processors only.  But it's also available on the 64-bit Via Nano,
Nano X2, and some Zhaoxin CPUs.

Approved by:    re (cperciva)
PR:             295517
Fixes:          88a53301e19 ("padlock.4: only install on i386")
Fixes:          d1ca01059d5 ("padlock(4)/nehemiah: move i386-only entropy")
Reviewed by:    kib
Differential Revision: https://reviews.freebsd.org/D57215

(cherry picked from commit 14b8531c4ccb836d755ce8a4f1b384164b5d9d94)
(cherry picked from commit 71ec93ff69f0b724a1c51e9fa772b08a10506112)
DeltaFile
+0-7sys/i386/conf/NOTES
+1-4share/man/man4/Makefile
+1-3sys/modules/Makefile
+1-0sys/conf/files.x86
+1-0sys/x86/conf/NOTES
+1-0sys/amd64/conf/GENERIC
+5-142 files not shown
+6-158 files

FreeBSD/src 54b4041etc/mtree BSD.usr.dist

mtree: usr: Add missing pkg/triggers entry

Approved by:    re (cperciva)
Reviewed by:    ivy
Fixes:          ea5e50c2985b ("packages: Add a mandoc package")
Differential Revision:  https://reviews.freebsd.org/D54682

(cherry picked from commit b8480379adcefaff0553aed1df67b249a0b194c8)
(cherry picked from commit 7669a182c232fcb9e1e4b627df2f306e7b0d23ea)
DeltaFile
+4-0etc/mtree/BSD.usr.dist
+4-01 files

FreeBSD/src 5efac4asys/amd64/vmm/io ppt.c

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

Approved by:    re (cperciva)
Fixes:          36b855f18925 ("amd64/vmm: Lock global PCI passthrough structures")
MFC after:      3 days
Reported by:    bz

(cherry picked from commit b133353310920aa823b1b5f83a308d0762f3bba3)
(cherry picked from commit deea28af8dced91b7aa50dadc28ec47ca3f1d478)
DeltaFile
+1-1sys/amd64/vmm/io/ppt.c
+1-11 files

FreeBSD/src d51d91busr.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:    re (cperciva)
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>

    [5 lines not shown]
DeltaFile
+6-8usr.sbin/syslogd/syslogd_cap_log.c
+6-81 files

FreeBSD/src 1b6c85ccontrib/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'

Approved by:    re (cperciva)
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

    [4 lines not shown]
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 1c4ffeacontrib/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'

Approved by:    re (cperciva)
MFC after:      1 week

(cherry picked from commit 5fa84c6ec176d186ddad25d31f8760e50f48157f)
(cherry picked from commit 64cdd794b53ee2b00dd312f235087056c0398e34)
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 bbb4700contrib/unbound configure config.h.in, contrib/unbound/doc unbound-anchor.8 libunbound.3

unbound: Update to 1.24.2

Merge commit 'ec5b94f552d7cb2a9d456c67e9941bcf5e3698bf'

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

Approved by:    re (cperciva)
MFC after:      1 week

(cherry picked from commit 22fa41b4e81ad91d11e28f1837764730d744d4e4)
(cherry picked from commit 1c869f005d760131cf49b965e67d4655c237f945)
DeltaFile
+2,692-1,909contrib/unbound/configure
+8-8lib/libunbound/config.h
+5-5contrib/unbound/config.h.in
+2-2contrib/unbound/doc/unbound-anchor.8
+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 4168e28contrib/unbound/doc unbound.conf.5 unbound-control.8

unbound: Regenerate for 1.24.1

No functional changes intended.

Approved by:    re (cperciva)
Fixes:          8b29c373e6ab ("unbound: Vendor import 1.24.1")
(cherry picked from commit 290190b26c09c307a9cd70703fa20ad2b2b600a6)
(cherry picked from commit d8a5915d22c894ca59c246394f2582185a2d61f8)
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 56fb2f6share/man/man7 intro.7

intro.7: Reference groups.7

Approved by:    re (cperciva)
PR:             264966
MFC after:      3 days

(cherry picked from commit 0f91468c040eb2129618e5ac251afc2529edb462)
(cherry picked from commit ef42bf7126ef3926a0e3d955e118d556825a556e)
DeltaFile
+3-1share/man/man7/intro.7
+3-11 files

FreeBSD/src 0ac3db8share/man/man7 groups.7, usr.bin/id groups.1 id.1

groups.7: New manual page of standard group names

Import groups(7) from NetBSD, with tweaks for our system. The group
list is sorted by GID. All the group names from /usr/src/etc/group
are described, except "uucp". The FILES section was added on top of
the original manual page.

Approved by:    re (cperciva)
PR:                     264966
Relnotes:               yes
MFC after:              3 days
Obtained from:          NetBSD
Reviewed by:            des, ziaee
Differential Revision:  https://reviews.freebsd.org/D54114

(cherry picked from commit e09104dfb76a36b65a64bd315bd1520941c4beed)
(cherry picked from commit 2c4190609c78c532e0a667eba1ffb4b5c98ea532)
DeltaFile
+345-0share/man/man7/groups.7
+3-2usr.sbin/chkgrp/chkgrp.8
+3-2usr.bin/id/groups.1
+3-2usr.bin/id/id.1
+3-2usr.bin/newgrp/newgrp.1
+2-1usr.sbin/adduser/adduser.8
+359-96 files not shown
+371-1412 files

FreeBSD/src 804daf1sys/kern imgact_elf.c

imgact_elf: read program headers if not contained in the first page

PR:     295629
Reviewed by:    markj
Tested by:      Alex S <iwtcex at gmail.com>
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D57294
DeltaFile
+62-29sys/kern/imgact_elf.c
+62-291 files

FreeBSD/src 9b72933sys/kern imgact_elf.c kern_exec.c, sys/sys imgact.h

image activators: pass the current thread

Reviewed by:    markj
Tested by:      Alex S <iwtcex at gmail.com>
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D57294
DeltaFile
+16-20sys/kern/imgact_elf.c
+1-0sys/sys/imgact.h
+1-0sys/kern/kern_exec.c
+18-203 files

FreeBSD/src 97f7b21sys/netlink/route rt.c

rtnetlink: Fix weight overflow in RTA_MULTIPATH

If the weight value is larger than 8 bits, set it to the maximum.
Also, only send RTA_WEIGHT if its value is not the default.
This reduces message size and matches the behavior of
non-multipath routes.

Reviewed by:    emaste, markj
Differential Revision: https://reviews.freebsd.org/D57266
DeltaFile
+3-2sys/netlink/route/rt.c
+3-21 files

FreeBSD/src 7745430sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: migrate key data access to functions

* Migrate the k->wk_key and k->wk_keylen access to the new crypto methods
  in net80211
* don't use ic_miclen, use the tx/rx mic len methods
* don't use wk_txmic and wk_rxmic, use the tx/rx mic data methods

This is in preparation to support GTK/IGTK keys and > 128 bit keys.

Reviewed by:    bz
Differential Revision:  https://reviews.freebsd.org/D54485
DeltaFile
+15-9sys/compat/linuxkpi/common/src/linux_80211.c
+15-91 files

FreeBSD/src 30c85b7sys/compat/linux linux_mmap.c

linuxulator: return EBADF for O_PATH mmap()

This fixes LTP open13, which expects O_PATH mmap() to fail
with EBADF, but FreeBSD returned EACCES.

Signed-off-by:  YAO, Xin <mr.yaoxin at outlook.com>
PR:             295571
Reviewed by:    kib
Pull-Request:   https://github.com/freebsd/freebsd-src/pull/2233
DeltaFile
+4-0sys/compat/linux/linux_mmap.c
+4-01 files

FreeBSD/src a172f9esys/dev/cxgbe adapter.h, sys/dev/cxgbe/common t4_hw.c

cxgbe(4): Improvements to the slow interrupt handler

* Add a flag to indicate that an INT_CAUSE should not be cleared
  automatically in the generic handler.  This is to ensure correct
  operation of some INT_CAUSEs that are related to each other and must
  be cleared in a certain order.
* Add decode for many more INT_CAUSE registers.

MFC after:      1 week
Sponsored by:   Chelsio Communications
DeltaFile
+1,651-192sys/dev/cxgbe/common/t4_hw.c
+1-0sys/dev/cxgbe/adapter.h
+1,652-1922 files

FreeBSD/src 0a02a47sys/amd64/amd64 machdep.c support.S

x86: for wrmsr_early_safe(), catch all exceptions, not only #GP

Reviewed by:    olce
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D57264
DeltaFile
+15-9sys/amd64/amd64/machdep.c
+3-4sys/amd64/amd64/support.S
+18-132 files

FreeBSD/src 95fc64cusr.sbin/ctld kernel.cc

ctld: More consistent error messages

The error messages ctld emits when it finds a port or LUN it did not
create were inconsistent with each other as well as with ctld's other
error messages.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    jhb
Differential Revision:  https://reviews.freebsd.org/D57270
DeltaFile
+5-5usr.sbin/ctld/kernel.cc
+5-51 files

FreeBSD/src a7df326tests/sys/kern ptrace_test.c

ptrace_test: expect PT_STEP tests to fail on riscv

ptrace_single_step currently returns EOPNOTSUPP on riscv.

This temporarily fixes the following CI failures:
https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ptrace_test/ptrace__PT_STEP_with_signal/
https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ptrace_test/ptrace__step_siginfo/

Reviewed by:    kib
Approved by:    emaste (mentor)
Differential Revision:  https://reviews.freebsd.org/D57288
DeltaFile
+8-0tests/sys/kern/ptrace_test.c
+8-01 files