HardenedBSD/src 091a52esys/amd64/amd64 trap.c exec_machdep.c, sys/amd64/ia32 ia32_signal.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+71-48sys/amd64/amd64/trap.c
+46-70sys/dev/tpm/tpm20.c
+49-6sys/x86/include/frame.h
+28-0sys/amd64/ia32/ia32_signal.c
+14-14sys/dev/tpm/tpm_tis_core.c
+19-0sys/amd64/amd64/exec_machdep.c
+227-1387 files not shown
+252-16313 files

HardenedBSD/src a87bde8sys/dev/acpica acpi_spmc.c

acpi_spmc: Simplify constraint freeing

We don't need to check for NULL before calling free().

Sponsored by:   The FreeBSD Foundation
DeltaFile
+3-7sys/dev/acpica/acpi_spmc.c
+3-71 files

HardenedBSD/src 2547f97share/man/man4 acpi.4

acpi.4: Update sysctl descriptions for new stypes

The previous S1-S5 options are still accepted for compatibility, but
they are now deprecated in favour of the new generic sleep types.

Reported by:    markj
Reviewed by:    markj
Approved by:    markj
Fixes:          97d152698f48 ("acpi: Use sleep types defined in sys/power.h")
Event:          AsiaBSDCon 2026
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D56008
DeltaFile
+14-13share/man/man4/acpi.4
+14-131 files

HardenedBSD/src 66447absys/dev/acpica acpi.c

acpi: Print sysctl name in deprecated sleep type warning

Reported by:    markj
Fixes:          97d152698f48 ("acpi: Use sleep types defined in sys/power.h")
Event:          AsiaBSDCon 2026
Sponsored by:   The FreeBSD Foundation
DeltaFile
+3-3sys/dev/acpica/acpi.c
+3-31 files

HardenedBSD/src 359505esecure/lib/libcrypto/modules Makefile.inc

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3secure/lib/libcrypto/modules/Makefile.inc
+0-31 files

HardenedBSD/src ec4f0easys/amd64/amd64 trap.c exec_machdep.c, sys/amd64/ia32 ia32_signal.c

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        secure/lib/libcrypto/modules/Makefile.inc (unresolved)
DeltaFile
+71-48sys/amd64/amd64/trap.c
+46-70sys/dev/tpm/tpm20.c
+49-6sys/x86/include/frame.h
+28-0sys/amd64/ia32/ia32_signal.c
+14-14sys/dev/tpm/tpm_tis_core.c
+19-0sys/amd64/amd64/exec_machdep.c
+227-1388 files not shown
+255-16314 files

HardenedBSD/src e520fd1. Makefile.inc1, libexec/pkg-serve pkg-serve.c pkg-serve.8

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+230-0libexec/pkg-serve/tests/pkg_serve_test.sh
+180-0libexec/pkg-serve/pkg-serve.c
+107-0libexec/pkg-serve/pkg-serve.8
+29-0share/man/man4/man4.arm/dwcotg.4
+18-3Makefile.inc1
+17-1share/man/man5/src.conf.5
+581-434 files not shown
+656-4340 files

HardenedBSD/src 8cc1c0fsys/amd64/amd64 trap.c

amd64 trap.c: provide tag for the struct sfhandlers definition

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+4-2sys/amd64/amd64/trap.c
+4-21 files

HardenedBSD/src acce5fasys/amd64/amd64 fpu.c

amd64: remove assertion about sizeof(struct pcb)

We no longer put pcb on stack, it is part of the struct thread.
Similarly, we do not put user fpu save area on stack.  There is no
constraints on the pcb size due to the XSAVE area required alignment.

Reviewed by:    jhb, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55931
DeltaFile
+0-7sys/amd64/amd64/fpu.c
+0-71 files

HardenedBSD/src 23dc485sys/amd64/include md_var.h

amd64: add prototype for ia32_syscall()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+2-0sys/amd64/include/md_var.h
+2-01 files

HardenedBSD/src 6275cd7sys/sys param.h

sys/param.h: bump __FreeBSD_version for amd64 struct trapframe size change

Requested by:   jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+2-1sys/sys/param.h
+2-11 files

HardenedBSD/src 36fc677secure/lib/libcrypto/modules Makefile.inc

HBSD: Append to SHARED_CFLAGS

PICFLAG should not be modified by individual components in base.
Instead, use SHARED_CFLAGS to set the -DOPENSSL_PIC flag.

FreeBSD reverted the bad commit, whereas HardenedBSD fixed the problem
they introduced.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
Fixes:          14b9955e57cc28b61e785165b9effcbe620edb46
DeltaFile
+1-1secure/lib/libcrypto/modules/Makefile.inc
+1-11 files

HardenedBSD/src 8892176sys/amd64/amd64 exec_machdep.c, sys/amd64/ia32 ia32_signal.c

amd64: check that %cs and %ss values from ucontext fit into registers

This change only checks that the values from the user-supplied context
are not truncated by C implicit type convertions.  The validity of the
segment selectors is still checked by hardware.

Reviewed by:    jhb, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55861
DeltaFile
+28-0sys/amd64/ia32/ia32_signal.c
+19-0sys/amd64/amd64/exec_machdep.c
+47-02 files

HardenedBSD/src e18449fsys/amd64/amd64 trap.c

amd64: move code to check for traps with interrupts disabled into helpers

Reviewed by:    jhb, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55809
DeltaFile
+58-38sys/amd64/amd64/trap.c
+58-381 files

HardenedBSD/src e909506sys/amd64/amd64 trap.c, sys/x86/include frame.h

x86 FRED: add hardware definitions for the trap frames fields

as provided by the Intel document 346446-009 AKA FRED 8.0 and SDM v90,
February 2026.

Note that the layout of the struct trapframe does not change with
FRED. The differences are in addition of two fields at the end of the
structure. Other members are carved from existing tf_cs and tf_ss by
limiting hw-written segments to 16 bits officially, and reusing rest
from the doubleword for the new data.

Reviewed by:    jhb, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55831
DeltaFile
+49-6sys/x86/include/frame.h
+9-8sys/amd64/amd64/trap.c
+58-142 files

HardenedBSD/src 67b918esecure/lib/libcrypto/modules Makefile.inc

Revert "libcrypto: compile all PIC objects with -DOPENSSL_PIC"

This commit broke the build with some build options.

Some validation needs to be done to confirm that moving the preprocessor
argument to `secure/lib/libcrypto/Makefile.inc` works without breaking
the build, but revert for now until a `tinderbox` run can be done with
the change.

PR:             293934
Reported by:    Jenkins, Trond Endrestøl

This reverts commit 14b9955e57cc28b61e785165b9effcbe620edb46.
DeltaFile
+0-2secure/lib/libcrypto/modules/Makefile.inc
+0-21 files

HardenedBSD/src e296211. Makefile.inc1

Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools

Because of this setting we were still using ELF Tool Chain tools for
buildworld.  The sets of binary utilities are largely equivalent and
this went unnoticed after commit 1cae7121c667 ("Enable LLVM_BINUTILS
by default").

This was discovered recently because ELF Tool Chain objcopy produces
standalone debug files without phdrs and this caused an issue with a
3rd party ELF parser [1].  Remove the forced setting so that we use
LLVM's binutils to build the system.

[1] https://sourceware.org/bugzilla/show_bug.cgi?id=33876

Re-commit after fixing a bootstrapping issue with LLVM binutils (in
17494c6e6b7d "build: Boostrap LLVM_BINUTILS for cross-tools").

Reviewed by:    imp, jhb
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55650
DeltaFile
+0-1Makefile.inc1
+0-11 files

HardenedBSD/src 1fd43eesys/dev/tpm tpm20.c tpm_tis_core.c

tpm: fix multi-threaded access with per-open state

The TPM driver currently has a single buffer per instance to hold the
result of a command, and does not allow subsequent commands to be sent
until the current result is read by the same OS thread that sent the
command, with a timeout to throw away the result after a while if the
result is not read in a timely fashion.  This has a couple problems:

 - The timeout code has a bug which causes all subsequent commands to
   hang forever if a different OS thread tries to read the result
   before the OS thread which sent the command, and the OS thread
   which sent the command never tries to read the result.

 - Even if the first problem is fixed, applications expect to be able
   to read the result from a different OS thread than the OS thread
   which sent the command. The particular case that we saw was a go
   application where the go runtime scheduled the goroutine which read
   the result to a different OS thread from one where the goroutine
   that sent the command ran, and there's no way to force these to

    [11 lines not shown]
DeltaFile
+46-70sys/dev/tpm/tpm20.c
+14-14sys/dev/tpm/tpm_tis_core.c
+9-10sys/dev/tpm/tpm_crb.c
+7-6sys/dev/tpm/tpm20.h
+5-0sys/dev/tpm/tpm_if.m
+81-1005 files

HardenedBSD/src 8ab3fe2. Makefile.inc1

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-4Makefile.inc1
+1-41 files

HardenedBSD/src ed58e04. Makefile.inc1, libexec/pkg-serve pkg-serve.c pkg-serve.8

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        Makefile.inc1 (unresolved)
DeltaFile
+230-0libexec/pkg-serve/tests/pkg_serve_test.sh
+180-0libexec/pkg-serve/pkg-serve.c
+107-0libexec/pkg-serve/pkg-serve.8
+29-0share/man/man4/man4.arm/dwcotg.4
+20-2Makefile.inc1
+17-1share/man/man5/src.conf.5
+583-333 files not shown
+657-4139 files

HardenedBSD/src d5ed210sys/contrib/dev/athk/ath12k mac.c debugfs_htt_stats.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+9,336-1,825sys/contrib/dev/athk/ath12k/mac.c
+6,178-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.c
+4,684-353sys/contrib/dev/athk/ath12k/wmi.c
+2,346-505sys/contrib/dev/athk/ath12k/dp_mon.c
+2,076-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.h
+1,814-206sys/contrib/dev/athk/ath12k/wmi.h
+26,434-2,889256 files not shown
+50,511-8,328262 files

HardenedBSD/src c80af7alibexec/nuageinit nuageinit.7, sys/compat/freebsd32 freebsd32_misc.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2libexec/nuageinit/nuageinit.7
+1-1sys/compat/freebsd32/freebsd32_misc.c
+1-1sys/kern/uipc_shm.c
+1-0sys/compat/linux/linux_misc.c
+5-44 files

HardenedBSD/src 632ddb8krb5/lib/apputils Makefile, krb5/lib/crypto Makefile

krb5: append to LDFLAGS instead of replacing

Sponsored by:   Netflix
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D55335
DeltaFile
+1-1krb5/plugins/audit/Makefile
+1-1krb5/lib/apputils/Makefile
+1-1krb5/lib/crypto/Makefile
+1-1krb5/lib/gssapi/Makefile
+1-1krb5/lib/kadm5clnt/Makefile
+1-1krb5/lib/kadm5srv/Makefile
+6-614 files not shown
+20-2020 files

HardenedBSD/src 03b7b77sys/netinet/tcp_stacks rack_bbr_common.c

tcp/rack: don't call call tcp_state_change() before tcp_close()

Reviewed by:            tuexen, rrs
Differential Revision:  https://reviews.freebsd.org/D55969
DeltaFile
+0-1sys/netinet/tcp_stacks/rack_bbr_common.c
+0-11 files

HardenedBSD/src 0798ad8sys/netinet tcp_usrreq.c

tcp: remove extraneous code

The tcp_close() will perform both actions.

Reviewed by:            pouria, tuexen, rrs
Differential Revision:  https://reviews.freebsd.org/D55965
DeltaFile
+0-5sys/netinet/tcp_usrreq.c
+0-51 files

HardenedBSD/src 3bfda6flibexec/nuageinit nuageinit.7

nuageinit.7: fix cloud-config header line

This updates the nuageinit man page by aligning mentions of the
cloud-config header line with the cloud-init documentation[0], removing
an unwanted "!" character.

[0] https://docs.cloud-init.io/en/latest/explanation/about-cloud-config.html#how-do-i-create-a-cloud-config-file

Signed-off-by: Jonathan Matthews <freebsd at hello.jonathanmatthews.com>
Differential Revision:  https://reviews.freebsd.org/D53706
(cherry picked from commit 4ab2d625e1462e9a78cb8086906c1a3da3aa6713)
DeltaFile
+2-2libexec/nuageinit/nuageinit.7
+2-21 files

HardenedBSD/src 3d218b6sys/cam/scsi scsi_all.c

cam (scsi): silence "Medium not present" SCSI sense logging for removable media

Change SS_FATAL to SS_FAIL for SCSI sense code 0x3A (Medium not present)
to suppress console spam when card readers or other removable media
devices have no media inserted.

The error is still returned to callers (ENXIO), but no longer prints to
dmesg during boot/probe.

Verified with Apple SD Card Reader - reduced boot messages from 4 to 2.

Reviewed by:    emaste, imp
Differential Revision: https://reviews.freebsd.org/D55287
DeltaFile
+3-3sys/cam/scsi/scsi_all.c
+3-31 files

HardenedBSD/src 8475cd9share/man/man4/man4.arm dwcotg.4 Makefile

dwcotg.4: Initial manual page

Create visibility in apropos and the Hardware Release Notes.

MFC after:              3 days
Reviewed by:            pauamma, ray
Differential Revision:  https://reviews.freebsd.org/D53287
DeltaFile
+29-0share/man/man4/man4.arm/dwcotg.4
+1-0share/man/man4/man4.arm/Makefile
+30-02 files

HardenedBSD/src 0661997stand/efi/loader main.c

loader(8): embedded MD should be the most preferred currdev

A loader built with MD_IMAGE_SIZE is almost always meant for use with
its embedded image and should try that as currdev before anything else.
Recent changes (d69fc3a9dc71, 784150fd2535) seem to have relaxed the ZFS
code's search for a rootfs and exposed this problem.

Reviewed by:    imp, tsoome
MFC after:      1 week
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D55979
DeltaFile
+9-9stand/efi/loader/main.c
+9-91 files

HardenedBSD/src 70491d4sys/modules/zfs Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+2-4sys/modules/zfs/Makefile
+2-41 files