FreeBSD/src 77fd9e0crypto/openssh sshconnect2.c

upstream: fix hard-to-reach NULL deref during pubkey auth

To hit this, the user must be using a PEM style private key with no
corresponding .pub key adjacent to it.

OpenBSD-Commit-ID: b7150acc5322fa33f21491834d9471fbe3d30f20
(cherry picked from commit cf6c0b3b94cdc223f1b8be1ef2d93e993af5d976)

Reviewed by:    emaste
DeltaFile
+2-2crypto/openssh/sshconnect2.c
+2-21 files

FreeBSD/src b9d16b7sys/kern kern_sig.c, tests/sys/capsicum capmode.cc

sigqueue: In capability mode, only allow signalling self

This is copied from the check in kern_kill.

Reviewed by:    markj, oshogbo
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57244
DeltaFile
+9-3tests/sys/capsicum/capmode.cc
+10-0sys/kern/kern_sig.c
+19-32 files

FreeBSD/src c564074sys/netinet ip_divert.c

divert: Avoid using atomic_(load|store)_(acq|rel)_16

It's not implemented on some arches.  Use a plain int to count the
number of sockets in a divert lbgroup.

Reported by:    Jenkins
Fixes:          895a0ae67fe2 ("divert: Define semantics for SO_REUSEPORT_LB on divert sockets")
DeltaFile
+7-5sys/netinet/ip_divert.c
+7-51 files

FreeBSD/src 00b96a7sys/amd64/amd64 trap.c

amd64: Drop segment descriptor details from trap messsages

Segment descriptor contents are fixed on amd64 and not very interesting
compared to the other values that are displayed.

While here, include both the thread and process details of the current
thread and drop redundant output of the trap number.

Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D56989
DeltaFile
+3-13sys/amd64/amd64/trap.c
+3-131 files

FreeBSD/src 2750d95sys/netinet tcp_log_buf.c

tcp: fix TCP_ACCOUNTING build

The uninitialized timeval was discovered by the new clang.
DeltaFile
+1-0sys/netinet/tcp_log_buf.c
+1-01 files

FreeBSD/src 2ca9d92lib/libc/gen nlist.3

nlist.3: Add discouraged use notice

It is a relic from a.out days and is poorly specified. Although ELF
support was added to nlist, there are better ways to access ELF data.

Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57078

(cherry picked from commit 94b7a335683abcbcd76e8b67d37e21271d81590c)
(cherry picked from commit be2da08e0b5b82329e36a6cf3b98f9099c6184ce)
DeltaFile
+4-0lib/libc/gen/nlist.3
+4-01 files

FreeBSD/src 5083252lib/libc/gen nlist.3

nlist.3: Clarify which symbol table is used

nlist() requires section headers, and currently fetches symbol names
only from SHT_SYMTAB,

Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57065

(cherry picked from commit cd6bf930eafe850dc631feeaf8332832601f4225)
(cherry picked from commit e25366d46bf5cdd840d2827524f9ed29e2fcbc66)
DeltaFile
+5-3lib/libc/gen/nlist.3
+5-31 files

FreeBSD/src fea07b7lib/libc/gen nlist.3

nlist.3: Replace a.out(5) Xref with elf(5)

ELF support was added to nlist() in 1997, and a.out support was removed
in 2020.  The man page was not updated for either of these changes.

Fixes: 77909f597881 ("Initial elf nlist support, ...")
Fixes: 86cfa7e70b2b ("nlist: retire long-obsolete aout support")
Sponsored by: The FreeBSD Foundation

(cherry picked from commit 876a17321c896427d70de94101df4d888a19189b)

struct nlist is documented in both a.out(5) and stab(5), so add an Xref
to the latter.

(cherry picked from commit 762e451b318c8cbfddbcaaa92a218e8b45306eb9)
(cherry picked from commit 9d9651c49575e27f2873c10bb7fe855be29ff48a)
DeltaFile
+4-5lib/libc/gen/nlist.3
+4-51 files

FreeBSD/src 9d9651clib/libc/gen nlist.3

nlist.3: Replace a.out(5) Xref with elf(5)

ELF support was added to nlist() in 1997, and a.out support was removed
in 2020.  The man page was not updated for either of these changes.

Fixes: 77909f597881 ("Initial elf nlist support, ...")
Fixes: 86cfa7e70b2b ("nlist: retire long-obsolete aout support")
Sponsored by: The FreeBSD Foundation

(cherry picked from commit 876a17321c896427d70de94101df4d888a19189b)

struct nlist is documented in both a.out(5) and stab(5), so add an Xref
to the latter.

(cherry picked from commit 762e451b318c8cbfddbcaaa92a218e8b45306eb9)
DeltaFile
+4-3lib/libc/gen/nlist.3
+4-31 files

FreeBSD/src e25366dlib/libc/gen nlist.3

nlist.3: Clarify which symbol table is used

nlist() requires section headers, and currently fetches symbol names
only from SHT_SYMTAB,

Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57065

(cherry picked from commit cd6bf930eafe850dc631feeaf8332832601f4225)
DeltaFile
+5-3lib/libc/gen/nlist.3
+5-31 files

FreeBSD/src be2da08lib/libc/gen nlist.3

nlist.3: Add discouraged use notice

It is a relic from a.out days and is poorly specified. Although ELF
support was added to nlist, there are better ways to access ELF data.

Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57078

(cherry picked from commit 94b7a335683abcbcd76e8b67d37e21271d81590c)
DeltaFile
+4-0lib/libc/gen/nlist.3
+4-01 files

FreeBSD/src f3a50f7contrib/unbound configure config.h.in, contrib/unbound/doc unbound-checkconf.8.in unbound.8

unbound: Update to 1.24.2

Merge commit 'ec5b94f552d7cb2a9d456c67e9941bcf5e3698bf'

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

MFC after:      1 week

(cherry picked from commit 22fa41b4e81ad91d11e28f1837764730d744d4e4)
DeltaFile
+2,692-1,909contrib/unbound/configure
+8-8lib/libunbound/config.h
+5-5contrib/unbound/config.h.in
+2-2contrib/unbound/doc/unbound-checkconf.8.in
+2-2contrib/unbound/doc/unbound.8
+2-2contrib/unbound/doc/unbound.8.in
+2,711-1,92815 files not shown
+2,738-1,95421 files

FreeBSD/src a267928contrib/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

(cherry picked from commit 5fa84c6ec176d186ddad25d31f8760e50f48157f)
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 de9d7a2contrib/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

    [2 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 f8ad4dfcontrib/ldns config.sub rr.c

ldns: Update to 1.9.0

Merge commit '5eb18e8576462f5bb33fbd60fcbd752fe5791f33'

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

(cherry picked from commit 9ed998a81bab54203604d08293089db875758686)

ldns: Regenerate configuration after update

MFC after:      1 week
Fixes:          d44c9549ef31 ("ldns: Update to 1.8.4")
Fixes:          9ed998a81bab ("ldns: Update to 1.9.0")

(cherry picked from commit 70739f3499b03cfff6bdd985db0d81cde76be15a)

ldns: Fix unused variable on big-endian

    [5 lines not shown]
DeltaFile
+571-178contrib/ldns/config.sub
+111-18contrib/ldns/rr.c
+82-12contrib/ldns/configure
+66-2contrib/ldns/str2host.c
+60-0contrib/ldns/host2str.c
+29-29contrib/ldns/Makefile.in
+919-23932 files not shown
+1,303-30538 files

FreeBSD/src d61b19bcontrib/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")
(cherry picked from commit 290190b26c09c307a9cd70703fa20ad2b2b600a6)
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 22f95b6contrib/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.

(cherry picked from commit cd69bc03cf67b958e08206d49562903c57b5bd28)
DeltaFile
+1-1contrib/unbound/freebsd-configure.sh
+1-11 files

FreeBSD/src c81fa81contrib/ldns configure ltmain.sh, contrib/ldns/m4 libtool.m4

ldns: Update to 1.8.4

Merge commit '3dcfa5af412125cd1bad1d383ff7c18c5effbd77'

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

(cherry picked from commit d44c9549ef31884ac069b0306bad248a74bb2825)
DeltaFile
+670-208contrib/ldns/configure
+520-335contrib/ldns/ltmain.sh
+0-274contrib/ldns/README-Travis.md
+160-79contrib/ldns/config.sub
+131-98contrib/ldns/m4/libtool.m4
+154-69contrib/ldns/acx_nlnetlabs.m4
+1,635-1,06341 files not shown
+2,298-1,30447 files

FreeBSD/src 944bd28contrib/ldns/ldns config.h

ldns: Belatedly update for OpenSSL 3.0.0

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

(cherry picked from commit cbe037c970580efc40eeca4715ac51e4d0fea082)

ldns: Mark these commits as merged

(cherry picked from commit 2bc6aa3c41d0dc330fefa6363a23d2cfa0253f73)
(cherry picked from commit 597a090ff2ab868242e4ec1cdec7469edbe41c50)
(cherry picked from commit 399f9ca49b6ecc7fc9bd8b2a0fd487fea4570a65)
(cherry picked from commit f103898935e1b709adbdaed5e0b10f99a17b9a4a)
DeltaFile
+1-1contrib/ldns/ldns/config.h
+1-11 files

FreeBSD/src 64cdd79contrib/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

(cherry picked from commit 5fa84c6ec176d186ddad25d31f8760e50f48157f)
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 d8a5915contrib/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")
(cherry picked from commit 290190b26c09c307a9cd70703fa20ad2b2b600a6)
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 caae890contrib/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.

(cherry picked from commit cd69bc03cf67b958e08206d49562903c57b5bd28)
DeltaFile
+1-1contrib/unbound/freebsd-configure.sh
+1-11 files

FreeBSD/src 736c147contrib/ldns config.sub rr.c

ldns: Update to 1.9.0

Merge commit '5eb18e8576462f5bb33fbd60fcbd752fe5791f33'

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

(cherry picked from commit 9ed998a81bab54203604d08293089db875758686)

ldns: Regenerate configuration after update

MFC after:      1 week
Fixes:          d44c9549ef31 ("ldns: Update to 1.8.4")
Fixes:          9ed998a81bab ("ldns: Update to 1.9.0")

(cherry picked from commit 70739f3499b03cfff6bdd985db0d81cde76be15a)

ldns: Fix unused variable on big-endian

    [5 lines not shown]
DeltaFile
+571-178contrib/ldns/config.sub
+111-18contrib/ldns/rr.c
+82-12contrib/ldns/configure
+66-2contrib/ldns/str2host.c
+60-0contrib/ldns/host2str.c
+29-29contrib/ldns/Makefile.in
+919-23932 files not shown
+1,303-30538 files

FreeBSD/src d2a10ffcontrib/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

    [2 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 1c869f0contrib/unbound configure config.h.in, contrib/unbound/doc unbound.conf.5.in libunbound.3.in

unbound: Update to 1.24.2

Merge commit 'ec5b94f552d7cb2a9d456c67e9941bcf5e3698bf'

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

MFC after:      1 week

(cherry picked from commit 22fa41b4e81ad91d11e28f1837764730d744d4e4)
DeltaFile
+2,692-1,909contrib/unbound/configure
+8-8lib/libunbound/config.h
+5-5contrib/unbound/config.h.in
+2-2contrib/unbound/doc/unbound.conf.5.in
+2-2contrib/unbound/doc/libunbound.3.in
+2-2contrib/unbound/doc/unbound.8.in
+2,711-1,92815 files not shown
+2,738-1,95421 files

FreeBSD/src 4aa372bcontrib/ldns configure ltmain.sh, contrib/ldns/m4 libtool.m4

ldns: Update to 1.8.4

Merge commit '3dcfa5af412125cd1bad1d383ff7c18c5effbd77'

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

(cherry picked from commit d44c9549ef31884ac069b0306bad248a74bb2825)
DeltaFile
+670-208contrib/ldns/configure
+520-335contrib/ldns/ltmain.sh
+0-274contrib/ldns/README-Travis.md
+160-79contrib/ldns/config.sub
+131-98contrib/ldns/m4/libtool.m4
+154-69contrib/ldns/acx_nlnetlabs.m4
+1,635-1,06341 files not shown
+2,298-1,30447 files

FreeBSD/src 4a86691contrib/ldns/ldns config.h

ldns: Belatedly update for OpenSSL 3.0.0

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

(cherry picked from commit cbe037c970580efc40eeca4715ac51e4d0fea082)

ldns: Mark these commits as merged

(cherry picked from commit 2bc6aa3c41d0dc330fefa6363a23d2cfa0253f73)
(cherry picked from commit 597a090ff2ab868242e4ec1cdec7469edbe41c50)
(cherry picked from commit 399f9ca49b6ecc7fc9bd8b2a0fd487fea4570a65)
(cherry picked from commit f103898935e1b709adbdaed5e0b10f99a17b9a4a)
DeltaFile
+1-1contrib/ldns/ldns/config.h
+1-11 files

FreeBSD/src 895a0aelib/libsys getsockopt.2, share/man/man4 divert.4

divert: Define semantics for SO_REUSEPORT_LB on divert sockets

Allow SO_REUSEPORT_LB to be set on divert sockets.  If set, then bind()
will add the socket to a "load-balancing group".  When a divert-to rule
matches a port with an associated group, the corresponding state ID is
used to select a specific socket from the group.  Packets without an
associated state are simply forwarded to the first socket in the group.
For now I only pass a state ID from pf, as I couldn't see a useful
identifier on the ipfw side.

This implementation is simple but has a caveat, that being that if
sockets are added to the group while flows are being processed, the size
of the group will change and this changes the mapping of state IDs to
sockets.  So, to get a consistent mapping, the divert socket application
must bind all of its sockets before any traffic is diverted by the
firewall.

Reviewed by:    glebius
MFC after:      1 month

    [3 lines not shown]
DeltaFile
+143-17sys/netinet/ip_divert.c
+21-3share/man/man4/divert.4
+5-1lib/libsys/getsockopt.2
+1-1sys/netinet/ip_var.h
+1-1sys/netinet/raw_ip.c
+1-1sys/netpfil/ipfw/ip_fw_pfil.c
+172-241 files not shown
+173-257 files

FreeBSD/src 9542ddbusr.sbin/bhyve pci_virtio_scsi.c pci_virtio_scsi.h

bhyve/virtio-scsi: Support multiple backends

In order to support multiple backends for virtio-scsi, we should isolate
the core of virtio-scsi from the backend-specific code. The existing
interface to CTL will become the new "CTL" backend for virtio-scsi.

Care has been taken to keep compatibility with previous configurations:
The first backend linked (CTL) will be the default backend if none is
specified, and it does provide a default configuration if no further
options such as targets are explicitly configured.

Reviewed by:    markj
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D53223
DeltaFile
+102-515usr.sbin/bhyve/pci_virtio_scsi.c
+394-0usr.sbin/bhyve/pci_virtio_scsi.h
+377-0usr.sbin/bhyve/pci_virtio_scsi_ctl.c
+30-14usr.sbin/bhyve/bhyve.8
+23-6usr.sbin/bhyve/bhyve_config.5
+1-0usr.sbin/bhyve/Makefile
+927-5356 files

FreeBSD/src ccb14beusr.sbin/bhyve pci_virtio_scsi.c pci_virtio_scsi.h

bhyve/virtio-scsi: Make all I/O processing parameters configurable

This includes:
- seg_max, the number of segments allowed in a single command
- {ctl,evt,req}_ringsz, the number of descriptors in a queue
- thr_per_q, the number of processing threads per request queue
- num_queues, the number of request queues

Reviewed by:    markj
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D54073
DeltaFile
+169-53usr.sbin/bhyve/pci_virtio_scsi.c
+57-23usr.sbin/bhyve/pci_virtio_scsi.h
+14-2usr.sbin/bhyve/bhyve_config.5
+12-0usr.sbin/bhyve/bhyve.8
+252-784 files