FreeBSD/src aa5bef3 — . myproposal.h channels.c, openbsd-compat readpassphrase.c port-uw.c

Vendor import of OpenSSH 10.6p2

Sponsored by:   The FreeBSD Foundation
DeltaFile
+13-5openbsd-compat/xcrypt.c
+13-4auth-passwd.c
+8-8openbsd-compat/port-uw.c
+5-5openbsd-compat/readpassphrase.c
+3-4channels.c
+3-2myproposal.h
+45-2810 files not shown
+60-3716 files

FreeBSD/src 27d5ac6 — contrib/expat Changes, contrib/expat/lib entities.h xmlparse.c

contrib/expat: import expat 2.10.0

Changes: https://github.com/libexpat/libexpat/blob/R_2_10_0/expat/Changes

Security:       CVE-2026-115506
Security:       CVE-2026-117610
Security:       CVE-2026-118370

(cherry picked from commit 765f30b9f3af67a1db9619ff18862dc74ac72674)
(cherry picked from commit a377d25bd25c0739d50c4dfe34ec2066821018d3)
DeltaFile
+731-138contrib/expat/lib/xmlparse.c
+246-0contrib/expat/tests/entities_tests.c
+180-1contrib/expat/tests/misc_tests.c
+99-0contrib/expat/lib/entities.h
+89-0contrib/expat/Changes
+48-15contrib/expat/tests/basic_tests.c
+1,393-15430 files not shown
+1,646-19736 files

FreeBSD/src b22b999 — lib/libsecureboot local.trust.mk

libsecureboot restore default trust anchors

If site.trust.mk does not set VE_SIGNATURE_LIST
initialize it based on content of VE_SIGNATURE_EXT_LIST
which is in turn initialized from TRUST_ANCHORS.

Sponsored by:   Hewlett Packard Enterprise Development LP

Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D61245
DeltaFile
+10-1lib/libsecureboot/local.trust.mk
+10-11 files

FreeBSD/src 8a24244 — release/pkg_repos release-dvd.conf, sys/conf newvers.sh

15.2: create releng/15.2 branch

* Update from PRERELEASE to BETA1
* Ship quarterly packages on DVDs
* Point pkg at stable/15 kmod packages since releng/15.2 packages
  don't exist yet
* Bump __FreeBSD_version to 1502000

Approved by:    re (implicit)
DeltaFile
+1-1usr.sbin/pkg/FreeBSD.conf.quarterly-release
+1-1sys/sys/param.h
+1-1sys/conf/newvers.sh
+1-1release/pkg_repos/release-dvd.conf
+4-44 files

FreeBSD/src b036c1e — sys/conf newvers.sh, sys/sys param.h

Post-15.2-branch updates

Rename stable/15 to -STABLE

Bump __FreeBSD_version to 1502500

Approved by:    re (implicit)
DeltaFile
+1-1sys/sys/param.h
+1-1sys/conf/newvers.sh
+2-22 files

FreeBSD/src cf59649 — sys/xdr xdr_mbuf.c

xdr_mbuf.c: Add a check for the return value for xdrmbuf_getbytes()

The xdrmbuf_getlong() function failed to check for the return
value from xdrmbuf_getbytes().  This could have resulted in
a failure during NFS RPC message processing.

Reviewed by:    rmacklem
MFC after:      2 weeks
Sponsored by:   VersatusHPC
DeltaFile
+2-1sys/xdr/xdr_mbuf.c
+2-11 files

FreeBSD/src 6b27d7f — contrib/expat Changes, contrib/expat/lib entities.h xmlparse.c

contrib/expat: import expat 2.10.0

Changes: https://github.com/libexpat/libexpat/blob/R_2_10_0/expat/Changes

Security:       CVE-2026-115506
Security:       CVE-2026-117610
Security:       CVE-2026-118370

(cherry picked from commit 765f30b9f3af67a1db9619ff18862dc74ac72674)
(cherry picked from commit a377d25bd25c0739d50c4dfe34ec2066821018d3)
DeltaFile
+731-138contrib/expat/lib/xmlparse.c
+246-0contrib/expat/tests/entities_tests.c
+180-1contrib/expat/tests/misc_tests.c
+99-0contrib/expat/lib/entities.h
+89-0contrib/expat/Changes
+48-15contrib/expat/tests/basic_tests.c
+1,393-15430 files not shown
+1,646-19736 files

FreeBSD/src 530ece4 — sys/kern sched_shim.c

sched: Add sysctl flag CTLFLAG_TUN to loader tunable kern.sched.name

So that `sysctl -T` can report it correctly.

Reviewed by:    olce, kib
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D61178

(cherry picked from commit 5e54a402f896106ed6b402e25387ad7402b8944c)
DeltaFile
+2-1sys/kern/sched_shim.c
+2-11 files

FreeBSD/src 44eaf36 — lib/libc/locale mbrtocXX_iconv.h

libc/locale: Check EILSEQ return

_citrus_iconv_std_iconv_convert can return EILSEQ without setting
invlen. As a result, we should check EILSEQ in the return value or it
will incorrectly return -2

Reviewed by:    kevans
Fixes: e2030ca246a7 ("libc: fix c*rtomb/mbrtoc*")
MFC after:      2 days
Differential Revision: https://reviews.freebsd.org/D61151

(cherry picked from commit b138d017c70421e9d074096fcc3ac676f7e1c846)
DeltaFile
+1-1lib/libc/locale/mbrtocXX_iconv.h
+1-11 files

FreeBSD/src 12f90bb — sys/dev/virtio/random virtio_random.c

virtio_random: defer first enqueue until after DRIVER_OK

According to the virtio spec:

> The driver MUST NOT send any buffer available notifications to the
> device before setting DRIVER_OK.

DRIVER_OK isn't set until after attach completes, so defer the first
enqueue.  We haven't found any problems as a result of this to the best
of my knowledge: q35 and other devices that we *have* been used with
will apparently check when we go DRIVER_OK.

Tested with q35 virtio-random, which still works.

Reported by:    llm-postcr
Reviewed by:    kfv, markj
Fixes:  f1c5a2e3a62505 ("virtio_random: Pipeline fetching the data")
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D61228
DeltaFile
+16-2sys/dev/virtio/random/virtio_random.c
+16-21 files

FreeBSD/src 3c40506 — sbin/ggate/ggated ggated.c, sbin/ggate/ggatel ggatel.c

ggate: fix test intermittency

* ggatel: fix piped output.  Flush stdout before daemonizing, so the
  output can be read when it's in a command pipeline.

* ggated: bind the port _before_ daemonizing, so an invoking script can
  be sure that the port is bound as soon as the command returns.

* tests: allow ggatec or ggatel to automatically allocate a device
  number instead of choosing one in a racy way.

With all of these changes I can no run the tests 1000 times without
fail.  And in parallel, too.

Sponsored by:   ConnectWise
PR:             298942
Reported by:    siva
Reviewed by:    ngie
Differential Revision: https://reviews.freebsd.org/D60707

    [2 lines not shown]
DeltaFile
+17-31tests/sys/geom/class/gate/ggate_test.sh
+13-8sbin/ggate/ggated/ggated.c
+3-1sbin/ggate/ggatel/ggatel.c
+0-3tests/sys/geom/class/gate/Makefile
+33-434 files

FreeBSD/src 878084c — sys/fs/nfsserver nfs_nfsdstate.c

nfsserver: Do not increment seqid on BADSEQID

When returning NFSERR_BADSEQID, the server should not have incremented
the sequence ID, yet the call to nfsrv_checkseqid() a few lines above
does precisely that.  Instead, check for a legitimate retransmission
of the original successful request, and reject otherwise, before the
ticket is used and sequence ID incremented.

MFC after:      1 week
Fixes:          ff45b9fc1a8c ("Bjorn reported a problem...")
Sponsored by:   Klara, Inc.
Reviewed by:    rmacklem
Differential Revision:  https://reviews.freebsd.org/D61156
DeltaFile
+20-8sys/fs/nfsserver/nfs_nfsdstate.c
+20-81 files

FreeBSD/src 3ac9299 — lib/libc/gen Symbol.map timespec_getres.3, lib/libc/tests/gen Makefile timespec_getres_test.c

libc: Export timespec_getres(3) and add tests

timespec_getres() has been declared in <time.h> and built into libc,
but never listed in a symbol map.  It is therefore local to libc.so,
and dynamically linked callers fail to link.

Reviewed by:    ziaee, fuz, des
Approved by:    fuz (mentor)
Fixes:          9b5d724cad10 ("libc: Add timespec_getres(3) as per C23.")
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D60799
DeltaFile
+124-0lib/libc/tests/gen/timespec_getres_test.c
+6-2lib/libc/gen/timespec_getres.3
+1-0lib/libc/tests/gen/Makefile
+1-0lib/libc/gen/Symbol.map
+132-24 files

FreeBSD/src bfe4be8 — sys/dev/tpm tpm_crb.c

tpm_crb: wait for idle and locality release after each command

transmit only requested GO_IDLE and the locality release, so a back-to-back
command could see stale state and fail with EIO.
A post-send idle timeout no longer discards a completed response.

Reviewed by:    kbowling
Approved by:    kbowling
Differential Revision:  https://ron-dev.freebsd.org/FreeBSD/src/pulls/93
DeltaFile
+32-7sys/dev/tpm/tpm_crb.c
+32-71 files

FreeBSD/src 97b359e — sys/fs/tarfs tarfs_subr.c

tarfs: Fix length calculation for file read

When the offset is within a block rather than at its beginning, the
length should be clamped to the remaining length of the block, not its
total length.

Reported by:    n0ps1ed
MFC after:      1 week
Reviewed by:    markj, emaste
Differential Revision:  https://reviews.freebsd.org/D60904

(cherry picked from commit 18bce6e65cdf059618ff12ace82a9f7334e1b610)
DeltaFile
+3-2sys/fs/tarfs/tarfs_subr.c
+3-21 files

FreeBSD/src 7c44749 — sys/kern vfs_vnops.c

vfs: Avoid integer overflow when faulting

In vn_io_fault1(), the read / write length can easily exceed INT_MAX.
Passing it directly to uiomove(), which expects an int, results in a
negative uio_resid, which to the caller looks like we read more than
was requested.

PR:             298159
MFC after:      1 week
Reviewed by:    olce, kib
Differential Revision:  https://reviews.freebsd.org/D59412

(cherry picked from commit b487aca48535e5f04e4913447fcbe33f1bf56c68)
DeltaFile
+9-3sys/kern/vfs_vnops.c
+9-31 files

FreeBSD/src 6418155 — sys/fs/tarfs tarfs_subr.c

tarfs: Limit file name length

When indexing the tarball on mount, fail if a file or directory name
exceeds MAXNAMLEN.

Reported by:    n0ps1ed
Reported by:    Franz Bettag <franz at bett.ag>
MFC after:      1 week
Reviewed by:    markj, emaste
Differential Revision:  https://reviews.freebsd.org/D60903

(cherry picked from commit a38033234692e9dab6f3f4404adc693fccabc14a)
DeltaFile
+2-0sys/fs/tarfs/tarfs_subr.c
+2-01 files

FreeBSD/src bee1ce4 — sys/fs/tarfs tarfs_subr.c

tarfs: Limit file name length

When indexing the tarball on mount, fail if a file or directory name
exceeds MAXNAMLEN.

Reported by:    n0ps1ed
Reported by:    Franz Bettag <franz at bett.ag>
MFC after:      1 week
Reviewed by:    markj, emaste
Differential Revision:  https://reviews.freebsd.org/D60903

(cherry picked from commit a38033234692e9dab6f3f4404adc693fccabc14a)
DeltaFile
+2-0sys/fs/tarfs/tarfs_subr.c
+2-01 files

FreeBSD/src 9d5a02e — sys/fs/tarfs tarfs_subr.c

tarfs: Fix length calculation for file read

When the offset is within a block rather than at its beginning, the
length should be clamped to the remaining length of the block, not its
total length.

Reported by:    n0ps1ed
MFC after:      1 week
Reviewed by:    markj, emaste
Differential Revision:  https://reviews.freebsd.org/D60904

(cherry picked from commit 18bce6e65cdf059618ff12ace82a9f7334e1b610)
DeltaFile
+3-2sys/fs/tarfs/tarfs_subr.c
+3-21 files

FreeBSD/src 0946632 — sys/kern vfs_vnops.c

vfs: Avoid integer overflow when faulting

In vn_io_fault1(), the read / write length can easily exceed INT_MAX.
Passing it directly to uiomove(), which expects an int, results in a
negative uio_resid, which to the caller looks like we read more than
was requested.

PR:             298159
MFC after:      1 week
Reviewed by:    olce, kib
Differential Revision:  https://reviews.freebsd.org/D59412

(cherry picked from commit b487aca48535e5f04e4913447fcbe33f1bf56c68)
DeltaFile
+9-3sys/kern/vfs_vnops.c
+9-31 files

FreeBSD/src 843cb77 — sys/dev/etherswitch/e6000sw e6000sw.c

e6000sw: Write the value, not the register, in Clause 45 writes

e6000sw_write_xmdio() loaded the Clause 45 register address into the
SMI PHY data register a second time, where the value to write belongs,
so every Clause 45 write stored the register address.

Its only caller, e6000sw_serdes_power(), runs at attach for ports 9 and
10 of the 88E6190 and 88E6190X to power one SERDES interface up and the
other down.  It wrote 0x2000 to the SGMII control register and 0x1000
to the 10GBASE-R PCS control register instead, so neither interface was
powered down and the rest of each register was overwritten.

Fixes:          9aba06377d26 ("Add support for the Marvell 88E6190 11 ports switch.")
Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+1-1sys/dev/etherswitch/e6000sw/e6000sw.c
+1-11 files

FreeBSD/src 4b73245 — sys/dev/iavf if_iavf_iflib.c, sys/dev/ice if_ice_iflib.c

iflib: Use a single tx dma map

The need for a separate map for TSO and non-TSO seems to have arisen from
a misunderstanding about the DMA requirements for Intel drivers like
ice/ixl/iavf. Specifically, this Intel hardware has a quirk where no
more than N (=8) segs can be DMA'ed per packet on the wire. This limit
was enforced using a DMA map with a low segment limit for non-TSO and a
driver specific check for TSO. This led to a *lot* of complexity in
iflib (~80 extra lines of code that this change removes) when the
limit can simply be enforced via the existing EFBIG mechanisms.

This change adds a new flag, IFLIB_SPARSE_TX, that drivers for hardware
with this quirk must set.  When set, it causes non-TSO sends that
exceed isc_tx_nsegment to be treated as if bus_dmamap_load_mbuf_sg()
had returned EFBIG.

Due to the API/KABI change, I've bumped the FreeBSD version as well.

Note kgalazka suggested the flag, rather than a more awkward

    [5 lines not shown]
DeltaFile
+36-123sys/net/iflib.c
+4-1sys/net/iflib.h
+2-2sys/dev/ice/if_ice_iflib.c
+2-1sys/dev/ixl/if_ixl.c
+2-1sys/dev/iavf/if_iavf_iflib.c
+1-1sys/sys/param.h
+47-1296 files

FreeBSD/src 2734bbb — lib/libthr/thread thr_private.h

libthr: Create landing pad in thr_once in C++ exception

In _thr_once, if init_routine fails with exception, the stack allocate
__cup will become invalid when unwinder walk back and free the stack of
thr_once. This cause cleanup linked list be dangling. In here, we give
the cleanup function a landing pad so that we td can correctly point
to previous cleanup function.

Reviewed by:    kib
MFC after:      2 weeks
Differential Revision: https://reviews.freebsd.org/D61212
DeltaFile
+15-1lib/libthr/thread/thr_private.h
+15-11 files

FreeBSD/src 71937d8 — lib/libthr/thread thr_private.h

libthr: Predict libthr is initialized in _thr_check_init

_thr_check_init() is called on hot paths such as pthread_once(), and
the uninitialized case can only happen once. Mark it with
__predict_false so the compiler lays out the initialized case as the
fall-through path.

Reviewed by:    kib
MFC after:      2 weeks
Differential Revision: https://reviews.freebsd.org/D61213
DeltaFile
+1-1lib/libthr/thread/thr_private.h
+1-11 files

FreeBSD/src 1e1ce1f — lib/libthr/thread thr_once.c

libthr: Fix whitespace in thr_once.c

Remove trailing whitespace and replace space indentation with a tab.

No functional change.
DeltaFile
+2-2lib/libthr/thread/thr_once.c
+2-21 files

FreeBSD/src 8b63260 — sbin/hastd hastd.c

hastd: Remove pidfile on exit

Make hastd remove its pidfile before exit after catching a signal or a
stop control message, not just on failure to start.

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D60192

(cherry picked from commit 3f2f6bb8f7b562276bffd04a9ae4c05a351b4435)
DeltaFile
+1-0sbin/hastd/hastd.c
+1-01 files

FreeBSD/src 4478c54 — sbin/hastctl hastctl.c, sbin/hastd hast.h hastd.c

hastd: Add a stop control message

Add a stop control message which causes hastd to clean up and terminate.

Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D59344

(cherry picked from commit 7dfadd78ba3c4608c3631fb5008de77ea1e29e88)
DeltaFile
+17-0sbin/hastd/control.c
+14-0sbin/hastctl/hastctl.c
+8-4sbin/hastd/hastd.c
+1-0sbin/hastd/hast.h
+40-44 files

FreeBSD/src e3eaff9 — sbin/hastd hastd.c

hastd: Remove pidfile on exit

Make hastd remove its pidfile before exit after catching a signal or a
stop control message, not just on failure to start.

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D60192

(cherry picked from commit 3f2f6bb8f7b562276bffd04a9ae4c05a351b4435)
DeltaFile
+1-0sbin/hastd/hastd.c
+1-01 files

FreeBSD/src 55b061a — sbin/hastctl hastctl.c, sbin/hastd hast.h hastd.c

hastd: Add a stop control message

Add a stop control message which causes hastd to clean up and terminate.

Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D59344

(cherry picked from commit 7dfadd78ba3c4608c3631fb5008de77ea1e29e88)
DeltaFile
+17-0sbin/hastd/control.c
+14-0sbin/hastctl/hastctl.c
+8-4sbin/hastd/hastd.c
+1-0sbin/hastd/hast.h
+40-44 files

FreeBSD/src 5ed9f98 — share/man/man4 mrsas.4

mrsas(4): Add missing Xr to mrsasutil(8)
DeltaFile
+2-1share/man/man4/mrsas.4
+2-11 files