HardenedBSD/src fe0be67 — contrib/expat Changes, contrib/expat/doc reference.html

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+790-0contrib/expat/tests/props_tests.c
+681-73contrib/expat/doc/reference.html
+413-154contrib/expat/lib/xmlparse.c
+56-220contrib/expat/lib/xmltok.c
+131-39contrib/expat/tests/basic_tests.c
+102-26contrib/expat/Changes
+2,173-51255 files not shown
+3,066-90261 files

HardenedBSD/src 76c6eb0 — lib/libsys stat.2, share/man/man4 Makefile

Merge remote-tracking branch 'rad/hardened/15-stable/main' into hardened/15-stable/pledge
DeltaFile
+23-2lib/libsys/stat.2
+2-0sys/kern/vfs_vnops.c
+2-0sys/kern/vfs_syscalls.c
+1-0sys/sys/stat.h
+1-0share/man/man4/Makefile
+29-25 files

HardenedBSD/src 380114c — contrib/expat Changes, contrib/expat/doc reference.html

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+790-0contrib/expat/tests/props_tests.c
+681-73contrib/expat/doc/reference.html
+413-154contrib/expat/lib/xmlparse.c
+56-220contrib/expat/lib/xmltok.c
+131-39contrib/expat/tests/basic_tests.c
+102-26contrib/expat/Changes
+2,173-51255 files not shown
+3,066-90261 files

HardenedBSD/src 29c9ef7 — lib/libsys stat.2, share/man/man4 Makefile

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+23-2lib/libsys/stat.2
+2-0sys/kern/vfs_vnops.c
+2-0sys/kern/vfs_syscalls.c
+1-0sys/sys/stat.h
+1-0share/man/man4/Makefile
+29-25 files

HardenedBSD/src 556d10a — share/man/man4 Makefile

man: Link ena.4 to if_ena.4

For consistency, create a symbolic link from ena.4 to also if_ena.4

Reviewed by:            #manpages, ziaee
Differential Revision:  https://reviews.freebsd.org/D60191
MFC after:              3 days

(cherry picked from commit 566fdcba48817b0f8fea1f9b2963505b925675fb)
DeltaFile
+1-0share/man/man4/Makefile
+1-01 files

HardenedBSD/src 139fa2c — sys/net/route route_ctl.c

routing: fix rtentry use-after-free in multipath route append

add_route_flags() drops the RIB lock and passes the existing entry,
rt_orig, to add_route_flags_mpath(). If a concurrent delete removes
the prefix in that window, the retry re-inserts rt_orig, which is
then freed while still linked, crashing later in rn_match().

Pass the new rt instead, return ENOENT when the prefix is gone and
RTM_F_CREATE is not set, and fix the rnd_orig NULL check.

Approved by:    pouria
Fixes:          c24a8f19c5d5 ("routing: fix rib_add_route_px()")
Differential Revision:  https://reviews.freebsd.org/D60353
DeltaFile
+12-2sys/net/route/route_ctl.c
+12-21 files

HardenedBSD/src a6a8640 — tests/sys/netinet6 ndp.sh

tests/netinet6: fix ndp_del_gu_success flakiness

The test pinged an unanswered address and then deleted the resulting
INCOMPLETE neighbor entry.
The kernel frees that entry after about 3s, so on a loaded VM,
ndp -d could run too late and fail with ENOENT.

Configure 2001:db8::2 on epair0b so the ping gets a reply and the
entry becomes REACHABLE.

Approved by:    pouria
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D60348
DeltaFile
+8-4tests/sys/netinet6/ndp.sh
+8-41 files

HardenedBSD/src 9a0ea12 — lib/libsys stat.2

stat.2: document SFBSD_MNTROOT

(cherry picked from commit 1e8708d9b598415a993fecb7b5c5cc8a9e64cba5)
DeltaFile
+4-0lib/libsys/stat.2
+4-01 files

HardenedBSD/src ad3fdab — sys/kern vfs_vnops.c vfs_syscalls.c, sys/sys stat.h

stat(2): report mount points using st_bsdflags SFBSD_MNTPOINT flag

(cherry picked from commit 0d5d8872931c2659692b5e59db2190b715ff314c)
DeltaFile
+2-0sys/kern/vfs_vnops.c
+2-0sys/kern/vfs_syscalls.c
+1-0sys/sys/stat.h
+5-03 files

HardenedBSD/src 2961d9d — lib/libsys stat.2

stat(2): Document st_bsdflags and SFBSD_NAMEDATTR

(cherry picked from commit 72e391060bb6c83ed65ac7ca3936bd6e07ab1ebc)
DeltaFile
+19-2lib/libsys/stat.2
+19-21 files

HardenedBSD/src 77a7a48 — sys/fs/nfs nfs_var.h, sys/fs/nfsclient nfs_clrpcops.c nfs_clcomsubs.c

nfscl: Fix oddball cases for session slot release

We have identified some cases where silent slot loss can occur
when operations on NFS mounts are aborted. We experience this
when using NFSv4.2, but it likely also occurs with NFSv4.1.

A slot is acquired for compound operations by nfsv4_setsequence()
and freed by newnfs_request(). Any call path that abandons the
compound before reaching newnfs_request() loses the slot permanently.

We identified four call sites where this happens, one of
which where it actually does happen for us in a semi-reproducible
way, which allowed us to develop a candidate patch, attached.

The patch adds one function, nfsv4_freeunsentslot(), to
nfs_clcomsubs.c. It is called from each of the four call
sites: nfsrpc_writerpc(), nfsrpc_writeds(), and two in
nfsrpc_setextattr().


    [11 lines not shown]
DeltaFile
+18-0sys/fs/nfsclient/nfs_clcomsubs.c
+4-0sys/fs/nfsclient/nfs_clrpcops.c
+2-0sys/fs/nfs/nfs_var.h
+24-03 files

HardenedBSD/src 192781b — lib/libthr/thread thr_mutex.c

libthr: Consume error in check_and_init_mutex

MFC after:      2 weeks
DeltaFile
+1-1lib/libthr/thread/thr_mutex.c
+1-11 files

HardenedBSD/src 657c089 — lib/lib80211 lib80211_regdomain.c

lib80211: fix build with eXpat 2.9.0

eXpat 2.9.0 deprecates XML_GetCurrentLineNumber() in favour of
XML_GetCurrentLineNumber64().  The new function behaves the same
as the old one but is not prone to 32 bit integer wrap-around.
DeltaFile
+27-26lib/lib80211/lib80211_regdomain.c
+27-261 files

HardenedBSD/src 22c3edb — contrib/expat Changes, contrib/expat/doc reference.html

contrib/expat: import expat 2.9.0

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

Security:       CVE-2026-102633
Security:       CVE-2026-77214
MFC after:      3 days
DeltaFile
+790-0contrib/expat/tests/props_tests.c
+681-73contrib/expat/doc/reference.html
+413-154contrib/expat/lib/xmlparse.c
+56-220contrib/expat/lib/xmltok.c
+131-39contrib/expat/tests/basic_tests.c
+102-26contrib/expat/Changes
+2,173-51247 files not shown
+2,984-86753 files

HardenedBSD/src 9af3990 — contrib/netbsd-tests/lib/librt t_sem.c

sem test: avoid ETIMEDOUT races in the EINTR test cases

timedwait and clockwait_absolute_intr_remaining arm a 50ms SIGALRM and then
wait until an absolute deadline only 100ms in the future.
On a loaded VM the signal can be delivered more than 50ms late, so the wait
times out first.

Approved by:    imp
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D60347
DeltaFile
+10-2contrib/netbsd-tests/lib/librt/t_sem.c
+10-21 files

HardenedBSD/src 7d476b5 — sys/cam cam_iosched.c, sys/cam/ata ata_da.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+80-26sys/riscv/riscv/identcpu.c
+14-14sys/cam/scsi/scsi_da.c
+25-1sys/cam/cam_iosched.c
+5-19sys/cam/nvme/nvme_da.c
+10-13sys/cam/ata/ata_da.c
+15-6sys/dev/hwpmc/hwpmc_ibs.c
+149-792 files not shown
+153-808 files

HardenedBSD/src d79d0c8 — lib/libpmc libpmc.c, share/man/man4 hwpmc.4

Merge remote-tracking branch 'rad/hardened/15-stable/main' into hardened/15-stable/pledge
DeltaFile
+45-0sys/dev/hwpmc/hwpmc_mod.c
+25-0tests/sys/netpfil/pf/src_track.sh
+9-10lib/libpmc/libpmc.c
+15-2sys/sys/pmc.h
+15-0sys/dev/hwpmc/hwpmc_amd.c
+4-0share/man/man4/hwpmc.4
+113-122 files not shown
+116-138 files

HardenedBSD/src 568dd29 — sys/cam cam_iosched.c, sys/cam/ata ata_da.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+80-26sys/riscv/riscv/identcpu.c
+14-14sys/cam/scsi/scsi_da.c
+25-1sys/cam/cam_iosched.c
+5-19sys/cam/nvme/nvme_da.c
+10-13sys/cam/ata/ata_da.c
+15-6sys/dev/hwpmc/hwpmc_ibs.c
+149-792 files not shown
+153-808 files

HardenedBSD/src b4aa32c — lib/libpmc libpmc.c, share/man/man4 hwpmc.4

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+45-0sys/dev/hwpmc/hwpmc_mod.c
+25-0tests/sys/netpfil/pf/src_track.sh
+9-10lib/libpmc/libpmc.c
+15-2sys/sys/pmc.h
+15-0sys/dev/hwpmc/hwpmc_amd.c
+4-0share/man/man4/hwpmc.4
+113-122 files not shown
+116-138 files

HardenedBSD/src ab7249c — sys/cam cam_iosched.c

cam: Assert we have the periph lock when updating the iosched stats

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D60350
DeltaFile
+2-0sys/cam/cam_iosched.c
+2-01 files

HardenedBSD/src bd86f05 — sys/cam/scsi scsi_da.c

da: Update trim stats with the periph lock held

Separate the updating the stats for the completion from the biodone for
each one.

Sponsored by:           Netflix
Reviewed by:            ali_mashtizadeh.com
Differential Revision:  https://reviews.freebsd.org/D60156
DeltaFile
+14-14sys/cam/scsi/scsi_da.c
+14-141 files

HardenedBSD/src 7845cf8 — sys/cam/ata ata_da.c

ada: Update trim stats for every bio

Separate the updating the stats for the completion from the biodone for
each one.

Sponsored by:           Netflix
Reviewed by:            ali_mashtizadeh.com
Differential Revision:  https://reviews.freebsd.org/D60157
DeltaFile
+10-13sys/cam/ata/ata_da.c
+10-131 files

HardenedBSD/src 0040d1f — sys/cam cam_iosched.h cam_iosched.c, sys/cam/ata ata_da.c

cam: Rename cam_iosched_bio_complete to cam_iosched_bio_update_stats

The function updates scheduler statistics but does not complete the
bio. Rename it to avoid implying ownership of bio completion.

Sponsored by:           Netflix

Reviewed by:    ali_mashtizadeh.com
Differential Revision:  https://reviews.freebsd.org/D60349
DeltaFile
+3-3sys/cam/nvme/nvme_da.c
+1-1sys/cam/scsi/scsi_da.c
+1-1sys/cam/cam_iosched.h
+1-1sys/cam/cam_iosched.c
+1-1sys/cam/ata/ata_da.c
+7-75 files

HardenedBSD/src 4a3a5de — sys/cam cam_iosched.h cam_iosched.c, sys/cam/nvme nvme_da.c

nda: Update trim stats with the periph lock held

Separate the updating the stats for the completion from the biodone for
each one.

Sponsored by:           Netflix
Reviewed by:            ali_mashtizadeh.com
Differential Revision:  https://reviews.freebsd.org/D60155
DeltaFile
+4-18sys/cam/nvme/nvme_da.c
+22-0sys/cam/cam_iosched.c
+2-0sys/cam/cam_iosched.h
+28-183 files

HardenedBSD/src 3b4437e — sys/netpfil/pf pf_nl.c, tests/sys/netpfil/pf src_track.sh

pf: set the correct type for rule timeouts

PR:             298877
MFC after:      1 week
Sponsored by:   Rubicon Communications, LLC ("Netgate")

(cherry picked from commit 3c58e64369fd8124c83f1c7d63106bddca83fa1e)
DeltaFile
+25-0tests/sys/netpfil/pf/src_track.sh
+1-1sys/netpfil/pf/pf_nl.c
+26-12 files

HardenedBSD/src e3f5a83 — sbin/camcontrol fwdownload.c

camcontrol: Add Spectra Logic copyright

The majority of lines of code currently in fwdownload.c come from ken@'s
rework in commit 0e358df062dd ("Revamp camcontrol(8) fwdownload support
and add the opcodes subcommand.").  Add the appropriate copyright.

Approved by:    ken
DeltaFile
+1-0sbin/camcontrol/fwdownload.c
+1-01 files

HardenedBSD/src fabb224 — sbin/camcontrol fwdownload.c

camcontrol: Add support for firmware uploading on HPE-branded drives

PR:             299059
(cherry picked from commit b30e67dc130ea8217e92e0b4c462f189e2268eba)
DeltaFile
+2-0sbin/camcontrol/fwdownload.c
+2-01 files

HardenedBSD/src 3e01ebd — sys/riscv/riscv identcpu.c

riscv: support the new "riscv,isa-extensions" string-array.

Support the new "riscv,isa-extensions" property on RISC-V hart nodes
in FDT.

The "riscv,isa" property is deprecated, but cannot be removed because
doing so would break compatibility with existing DTBs. The new properties
replace it: "riscv,isa-base" describes the base ISA and
"riscv,isa-extensions" is a string array containing the supported ISA
extensions.

The "riscv,isa-extensions" property can be relatively large; on the
Spacemit K3 SoC it is approximately 300 bytes.

The FreeBSD OFW interface does not provide access to the underlying FDT
property data without copying it, and memory allocation is not possible
this early. So allocate a static buffer for the property instead.

Reuse the existing parse_riscv_isa() implementation to parse both the new

    [5 lines not shown]
DeltaFile
+80-26sys/riscv/riscv/identcpu.c
+80-261 files

HardenedBSD/src 572cd66 — sys/dev/hwpmc hwpmc_ibs.c

hwpmc: handle delayed IBS NMIs on Zen 6

On Zen 6, an extra IBS NMI can arrive after later samples. Keep the
credit until the empty NMI arrives, and handle fetch and op samples when
both are ready.

Reviewed by:    mhorne
Fixes:  34b00ed041a4 ("hwpmc: fix IBS fetch and op NMI handling")
Fixes:  e51ef8ae490f ("hwpmc: Initial support for AMD IBS")
Sponsored by:   AMD
Differential Revision:  https://reviews.freebsd.org/D60367
DeltaFile
+15-6sys/dev/hwpmc/hwpmc_ibs.c
+15-61 files

HardenedBSD/src 04aa36c — sys/sys pmc.h

pmc.h: bump PMC_VERSION_MINOR

Bump for the addition of PMC_OP_GETCAPS and the recently added Intel
CPUs.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit e39d3a6b32331437da6c13a4aeb67e5bcca67625)
DeltaFile
+1-1sys/sys/pmc.h
+1-11 files