HardenedBSD/src 5e622cd — sbin/fsck_msdosfs fat.c, sys/x86/cpufreq hwpstate_intel.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1sys/x86/cpufreq/hwpstate_intel.c
+1-1sbin/fsck_msdosfs/fat.c
+2-22 files

HardenedBSD/src a55cffe — sbin/fsck_msdosfs fat.c, sys/x86/cpufreq hwpstate_intel.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+1-1sys/x86/cpufreq/hwpstate_intel.c
+1-1sbin/fsck_msdosfs/fat.c
+2-22 files

HardenedBSD/src fd716e3 — sbin/fsck_msdosfs fat.c, sys/x86/cpufreq hwpstate_intel.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1sys/x86/cpufreq/hwpstate_intel.c
+1-1sbin/fsck_msdosfs/fat.c
+2-22 files

HardenedBSD/src 269002d — sbin/fsck_msdosfs fat.c

fsck_msdosfs: fix head bitmap over-allocation on 32-bit platforms

bitmap_ctor() computed the allocation size as

        roundup2(bits, LONG_BIT) / (LONG_BIT / 8)

The dividend is a count of bits, so converting it to bytes requires
dividing by 8 (bits per byte), not by LONG_BIT / 8 (bytes per long).
The two divisors happen to coincide on LP64, but on ILP32 platforms
the head bitmap was allocated at twice the required size; for a
FAT32 file system with close to 2^28 clusters, that is 64 MiB instead
of 32 MiB.

The extra half of the allocation was never accessed, so there is no
functional change other than the reduced memory footprint.

MFC after:      3 days
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2440
DeltaFile
+1-1sbin/fsck_msdosfs/fat.c
+1-11 files

HardenedBSD/src 10bd16d — sys/x86/cpufreq hwpstate_intel.c

ihwpstate_intel: update dev.hwpstate_intel.%d.epp sysctl description

Catch up with 8452afeb568: now dev.hwpstate_intel.%d.epp accepts
values from 0 to 255.  Update its description accordingly to sync
with the code and the man page.
DeltaFile
+1-1sys/x86/cpufreq/hwpstate_intel.c
+1-11 files

HardenedBSD/src e9c67d8 — . RELNOTES

MFC: Add release notes entry for less v710.

(cherry picked from commit 7f7e9584cb9dbff7f74faf5589c9154d2c6eef3f)
DeltaFile
+9-0RELNOTES
+9-01 files

HardenedBSD/src d3c6de9 — contrib/less lessmsg.inc lesskey.c

MFC: MFV: less v710.

(cherry picked from commit 4523eebc6c1828d4fd41d7f1ab943cf079043bc8)
DeltaFile
+342-280contrib/less/opttbl.c
+296-232contrib/less/screen.c
+246-129contrib/less/decode.c
+372-0contrib/less/lessmsg
+0-364contrib/less/lesskey.c
+331-0contrib/less/lessmsg.inc
+1,587-1,00552 files not shown
+3,285-1,81058 files

HardenedBSD/src 1dc191d — contrib/expat Makefile.in, contrib/expat/lib internal.h xmltok.c

contrib/expat: import expat 2.8.5

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

Security:       CVE-2026-93990

(cherry picked from commit c7b67985633c408cae69703ca443cbfd84d326a8)
DeltaFile
+349-5contrib/expat/tests/basic_tests.c
+100-123contrib/expat/lib/xmlparse.c
+139-64contrib/expat/lib/xmltok.c
+67-100contrib/expat/lib/internal.h
+105-56contrib/expat/Makefile.in
+157-0contrib/expat/tests/hash_tests.c
+917-34854 files not shown
+1,614-85960 files

HardenedBSD/src 2d19985 — sys/dev/nvme nvme_ctrlr_cmd.c nvme_sysctl.c, sys/dev/nvmf/host nvmf_ns.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+30-125sys/dev/nvme/nvme_sysctl.c
+15-21sys/dev/nvme/nvme_ctrlr_cmd.c
+14-19sys/dev/nvmf/host/nvmf_ns.c
+2-2sys/kern/sysv_shm.c
+61-1674 files

HardenedBSD/src 313ef4b — sys/dev/nvme nvme_ctrlr_cmd.c nvme_sysctl.c, sys/dev/nvmf/host nvmf_ns.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+30-125sys/dev/nvme/nvme_sysctl.c
+15-21sys/dev/nvme/nvme_ctrlr_cmd.c
+14-19sys/dev/nvmf/host/nvmf_ns.c
+2-2sys/kern/sysv_shm.c
+61-1674 files

HardenedBSD/src 9c4332b — sys/fs/fuse fuse_vnops.c fuse_io.c, tests/sys/fs/fusefs utils.cc ext2-misc.sh

Merge remote-tracking branch 'rad/hardened/15-stable/main' into hardened/15-stable/pledge
DeltaFile
+304-0tests/sys/fs/fusefs/misc.cc
+55-0tests/sys/fs/fusefs/ext2-misc.sh
+2-47sys/fs/fuse/fuse_io.c
+22-5sys/fs/fuse/fuse_vnops.c
+15-3usr.sbin/zonectl/zonectl.c
+2-1tests/sys/fs/fusefs/utils.cc
+400-564 files not shown
+404-6010 files

HardenedBSD/src 53590f6 — sys/dev/nvme nvme_ctrlr_cmd.c nvme_sysctl.c, sys/dev/nvmf/host nvmf_ns.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+30-125sys/dev/nvme/nvme_sysctl.c
+15-21sys/dev/nvme/nvme_ctrlr_cmd.c
+14-19sys/dev/nvmf/host/nvmf_ns.c
+2-2sys/kern/sysv_shm.c
+61-1674 files

HardenedBSD/src f697a54 — sys/fs/fuse fuse_vnops.c fuse_io.c, tests/sys/fs/fusefs utils.cc ext2-misc.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+304-0tests/sys/fs/fusefs/misc.cc
+55-0tests/sys/fs/fusefs/ext2-misc.sh
+2-47sys/fs/fuse/fuse_io.c
+22-5sys/fs/fuse/fuse_vnops.c
+15-3usr.sbin/zonectl/zonectl.c
+2-1tests/sys/fs/fusefs/utils.cc
+400-564 files not shown
+404-6010 files

HardenedBSD/src 4bfe526 — sys/dev/nvme nvme_ctrlr_cmd.c

nvme: share one routine between Delete I/O CQ and Delete I/O SQ

Reviewed by:    imp, adrian
Differential Revision:  https://reviews.freebsd.org/D60021
DeltaFile
+15-21sys/dev/nvme/nvme_ctrlr_cmd.c
+15-211 files

HardenedBSD/src 8a860e8 — sys/dev/nvme nvme_sysctl.c

nvme: collapse the per-counter qpair statistic sysctl handlers

A single handler that takes the counter's offset
within struct nvme_qpair in arg2.

No functional change

Reviewed by:    imp, adrian
Differential Revision:  https://reviews.freebsd.org/D60020
DeltaFile
+20-98sys/dev/nvme/nvme_sysctl.c
+20-981 files

HardenedBSD/src 130739e — sys/dev/nvmf/host nvmf_ns.c

nvmf: factor out the pending request abort loop

The routine is entered with the namespace lock held and drops it before
completing the requests, which preserves the existing locking.

Reviewed by:    imp, adrian
Differential Revision:  https://reviews.freebsd.org/D60019
DeltaFile
+14-19sys/dev/nvmf/host/nvmf_ns.c
+14-191 files

HardenedBSD/src 92dec92 — sys/dev/nvme nvme_sysctl.c

nvme: share one handler between the interrupt coalescing sysctls

The int_coal_time and int_coal_threshold handlers differed only in which
controller field they updated before reprogramming the feature.

Reviewed by:    imp, adrian
Differential Revision:  https://reviews.freebsd.org/D60018
DeltaFile
+10-27sys/dev/nvme/nvme_sysctl.c
+10-271 files

HardenedBSD/src 546d150 — sys/kern sysv_shm.c

sysvshm: Fix locking in shm_prison_set()

We were not acquiring the global sysvshm lock when handling cleanup of
sysvshm segments.  Acquire the lock in shm_prison_cleanup() instead, to
be consistent with the sysv semaphore code.

Reviewed by:    jamie
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60030
DeltaFile
+2-2sys/kern/sysv_shm.c
+2-21 files

HardenedBSD/src 8818f72 — lib/libpfctl libpfctl.c, sys/conf NOTES

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+228-0lib/libpfctl/libpfctl.c
+212-0sys/netpfil/pf/pf_nl.c
+63-0tests/sys/netpfil/pf/osfp.sh
+17-28sys/kern/kern_jail.c
+21-11sys/conf/NOTES
+32-0sys/netpfil/pf/pf_nl.h
+573-3920 files not shown
+616-12226 files

HardenedBSD/src 6ded33e — lib/libpfctl libpfctl.c, sys/conf NOTES

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+228-0lib/libpfctl/libpfctl.c
+212-0sys/netpfil/pf/pf_nl.c
+63-0tests/sys/netpfil/pf/osfp.sh
+17-28sys/kern/kern_jail.c
+21-11sys/conf/NOTES
+32-0sys/netpfil/pf/pf_nl.h
+573-3920 files not shown
+616-12226 files

HardenedBSD/src fbda54e — lib/libpfctl libpfctl.c, sys/conf NOTES

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+228-0lib/libpfctl/libpfctl.c
+212-0sys/netpfil/pf/pf_nl.c
+63-0tests/sys/netpfil/pf/osfp.sh
+17-28sys/kern/kern_jail.c
+21-11sys/conf/NOTES
+32-0sys/netpfil/pf/pf_nl.h
+573-3920 files not shown
+616-12226 files

HardenedBSD/src 5e8678f — usr.sbin/zonectl zonectl.c

zonectl: Consistently report ZAC conv. zones WP LBA

On ZAC drives, conventional zones conventionally report a write pointer
LBA of 0xffffffffffff. This field is 48 bits wide, unlike ZBC's 64 bits.

Recognize both ZAC and ZBC all-ones behaviour in the WRITE POINTER LBA
field to indicate non-valid information.

Tested by:      fuz
Discussed with: fuz, asomers, ken
Fixes:          4735ef6196bc ("zonectl: display conventional zones better")
MFC after:      2 weeks
Sponsored by:   Google Summer Of Code 2026
Reviewed by:    asomers
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2345

(cherry picked from commit 95a4412e3a4d41b430f298ea2c2a51f8aa119c2c)
DeltaFile
+2-1usr.sbin/zonectl/zonectl.c
+2-11 files

HardenedBSD/src de0aad8 — usr.bin/login login.conf

Increase the default mlock limit from 64k to 256k

The current default has been unchanged for 14 years.  Increase it to
keep pace with modern hardware and software.  security/pinentry-gnome,
in particular, can sometimes need 112 kB.

PR:             297452
MFC after:      2 weeks
Sponsored by:   ConnectWise
Reviewed by:    cye, emaste
Differential Revision: https://reviews.freebsd.org/D58811

(cherry picked from commit d9cf2a8671841e4415a22e16005d7700f0eb9b7e)
DeltaFile
+1-1usr.bin/login/login.conf
+1-11 files

HardenedBSD/src 1a6f201 — usr.sbin/zonectl zonectl.c

zonectl: display conventional zones better during RZ

zonectl's Report Zones subcommand displays a tabular list of zones.  A
conventional zone's WP column is displayed as 0xffffffffffffffff , the
literal value that the HDD reports.  But that's too wide for the column,
causing the text to be misaligned.  It's also not really meaningful,
because the Write Pointer isn't really defined for a Conventional zone.
Change it to "-1" to fix the text misalignment.

MFC after:      2 weeks
Sponsored by:   ConnectWise
Reviewed by:    fuz
Differential Revision: https://reviews.freebsd.org/D57512

(cherry picked from commit 4735ef6196bcb2802ad7fc7d1b8054a4756d786b)
DeltaFile
+14-3usr.sbin/zonectl/zonectl.c
+14-31 files

HardenedBSD/src c5031d3 — sys/fs/fuse fuse_node.h fuse_vnops.c, tests/sys/fs/fusefs utils.cc ext2-misc.sh

fusefs: fix vnode locking violations during execve

Fix two locking violations that could happen during execve, while
executing a file stored on fusefs.  Both would cause panics on an
INVARIANTS kernel after 15.0, or a DEBUG_VFS_LOCKS kernel prior to that.
Neither is likely to be noticeable on a release kernel.

* Don't assume that the vnode is exclusively locked during VOP_CLOSE.
  It usually is thanks to !MNTK_LOOKUP_SHARED, but isn't during execve,
  which locks the vnode outside of the lookup path.

* Totally rewrite fuse_io_invalbuf.  It's had a number of problems ever
  since its original introduction[^1]:

  - Don't assume that the vnode is exclusively locked.  That assumption
    failed during execve just like the assumption in fuse_vnop_close.

  - Don't livelock forever if vinvalbuf returns ENOSPC or EDQUOT.


    [21 lines not shown]
DeltaFile
+304-0tests/sys/fs/fusefs/misc.cc
+55-0tests/sys/fs/fusefs/ext2-misc.sh
+2-47sys/fs/fuse/fuse_io.c
+22-5sys/fs/fuse/fuse_vnops.c
+2-1tests/sys/fs/fusefs/utils.cc
+0-2sys/fs/fuse/fuse_node.h
+385-552 files not shown
+388-568 files

HardenedBSD/src 287d60a — sys/compat/linux linux_netlink.c

compat/linux: Fix IFLA_IFNAME translation for multi-message netlink

nlmsg_translate_ifname_nla() always used nw->ifp for the name,
which is fine for a single-message ifnet event, but an RTM_GETLINK
dump holds one RTM_NEWLINK per interface and is translated with
the ifp the writer had when the buffer was flushed.

The root of the problem is that msgs_to_linux() takes a single
ifp for a buffer that may contain messages about many interfaces.

Use ifi_index to resolve the name instead.

Reviewed by:    glebius
Differential Revision:  https://reviews.freebsd.org/D59595
DeltaFile
+8-5sys/compat/linux/linux_netlink.c
+8-51 files

HardenedBSD/src cb035c1 — sys/netpfil/ipfilter/netinet ip_lookup.c

ipfilter: fix inverted range check on the lookup iterator unit

ipf_lookup_iterate() validates iter.ili_unit with

  if (iter.ili_unit < IPL_LOGALL && iter.ili_unit > IPL_LOGMAX)

or alternatively,

  if (iter.ili_unit < -1 && iter.ili_unit > 7)

ipf_lookup_add(), ipf_lookup_delete(), ipf_lookup_stats()
ipf_lookup_flush() validate with a ||

Submitted by calif.io for the OpenAI Patch The Planet program

Signed-off-by: Andrew Griffiths <andrew at calif.io>

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59726
DeltaFile
+1-1sys/netpfil/ipfilter/netinet/ip_lookup.c
+1-11 files

HardenedBSD/src 4523cbb — sys/sys imgact_aout.h

imgact_aout: Remove a prototype for a non-existent function

aout_coredump() was removed in commit 1eecfae3e53cb3.

No functional change intended.

MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
DeltaFile
+0-8sys/sys/imgact_aout.h
+0-81 files

HardenedBSD/src 79af745 — sys/kern kern_jail.c

jail: Fix a race in prison_deref()

If we're killing a jail which has some user refs pending, then we would
first drop our ref and then kill all processes in the prison.  However,
it's possible for the prison to be freed before we finish that
operation, generally if the processes exit on their own before
prison_proc_iterate() returns.

Thus, defer the release of the prison refcount until after we've killed
all procs.

Reviewed by:    jamie
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59984
DeltaFile
+6-2sys/kern/kern_jail.c
+6-21 files

HardenedBSD/src d80c01b — sys/sys bio.h

geom: Remove unused fields from struct bio

The corresponding machinery was removed in commit 0c4440c3aafe6, ten
yearso ago.

No functional change intended.

Reviewed by:    imp
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59986
DeltaFile
+0-5sys/sys/bio.h
+0-51 files