HardenedBSD/src 59096c6release Makefile.ec2

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+5-1release/Makefile.ec2
+5-11 files

HardenedBSD/src eb9c65arelease Makefile.ec2

EC2: Add extra SSM Parameter names for releases

Record releases in the SSM Parameter Store not just as e.g.
  /aws/service/freebsd/arm64/small/ufs/15.0/RELEASE
but also as .../RELEASE/latest, e.g.
  /aws/service/freebsd/arm64/small/ufs/15.0/RELEASE/latest

The latter parameters will be updated when new AMIs are built with
security and errata updates appplied, and have been backfilled for
15.0.

MFC after:      3 days
MFC to:         stable/15 (14.x will not get security-update AMIs)
Sponsored by:   Amazon

(cherry picked from commit b558c92fd0005d311edbcd02953c17d4a34fb909)
DeltaFile
+5-1release/Makefile.ec2
+5-11 files

HardenedBSD/src b20d0f0release/tools arm.subr

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-7release/tools/arm.subr
+1-71 files

HardenedBSD/src 152cf02libexec/nuageinit nuageinit nuageinit.7, release/tools arm.subr vagrant.conf

Merge remote-tracking branch 'origin/freebsd/15-stable/main' into hardened/15-stable/main

Conflicts:
        release/tools/arm.subr (unresolved)
DeltaFile
+1,082-232share/misc/pci_vendors
+172-102libexec/nuageinit/nuageinit
+27-15libexec/nuageinit/nuageinit.7
+9-2share/misc/usb_vendors
+6-4release/tools/arm.subr
+1-7release/tools/vagrant.conf
+1,297-3625 files not shown
+1,302-37311 files

HardenedBSD/src cbd3ecblibexec/rtld-elf rtld.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-6libexec/rtld-elf/rtld.c
+0-61 files

HardenedBSD/src 3af83e8contrib/ncurses configure aclocal.m4, contrib/ncurses/doc/html ncurses-intro.html

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

Conflicts:
        libexec/rtld-elf/rtld.c (unresolved)
DeltaFile
+15,906-15,332contrib/ncurses/configure
+2,456-1,968contrib/ncurses/misc/terminfo.src
+0-3,390contrib/ncurses/doc/html/ncurses-intro.html
+0-2,282contrib/ncurses/ncurses/win32con/win_driver.c
+853-527contrib/ncurses/aclocal.m4
+639-518contrib/ncurses/announce.html.in
+19,854-24,017465 files not shown
+42,557-37,018471 files

HardenedBSD/src 75556c7sys/net80211 ieee80211_proto.c

net80211: fix arguments to IEEE80211_NOTE in ieee80211_fix_rate

Fix the arguments to the debug statement.

(slightly adjusted from the original submission by bz)

PR:             286448
MFC after:      3 days
DeltaFile
+2-2sys/net80211/ieee80211_proto.c
+2-21 files

HardenedBSD/src fa24602sys/compat/linuxkpi/common/include/linux pci.h

LinuxKPI: pci: fix pcie_get_speed_cap()

pcie_get_speed_cap() has a hard coded skip of 3 devices at the
beginning.  It is either called on a pdev or on a result from
pci_upstream_bridge().  In the latter case skipping another three
devices might get us to acpi0 or nexus, neither of which is a
PCI device still and pci_get_vendor() will panic() on that.

Sponsored by:   The FreeBSD Foundation (commit)
GHI:            https://github.com/freebsd/drm-kmod/issues/393
MFC after:      2 weeks
Differential Revision: https://reviews.freebsd.org/D53862
DeltaFile
+18-9sys/compat/linuxkpi/common/include/linux/pci.h
+18-91 files

HardenedBSD/src 4162a41sys/modules Makefile

modules: factor out LinuxKPI based wireless drivers and add RISC-V

The LinuxKPI based wireless drivers are currently limited to amd64 and
arm64 (and until cleaned up i386).  Adding RISC-V now as we have a
report that iwlwifi(4) works on RISC-V [1]. Factor the LinuxKPI based
wireless drivers out into their own block.

Given RISC-V has no ACPI support yet (though we fixed #includes in
order to keep compiling the drivers without further modifications
where possible) we need to take care of rtw89 which fails to compile
without ACPI enabled.  A quick check at the Linux build files indicates
that the depenency is not correctly recorded there either.  Disable
compiling rtw89 without ACPI (on RISC-V) for the moment until this is
fixed.

[1] https://mail-archive.freebsd.org/cgi/getmsg.cgi?fetch=5947+0+archive/2026/freebsd-wireless/20260112.freebsd-wireless

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days

    [2 lines not shown]
DeltaFile
+11-3sys/modules/Makefile
+11-31 files

HardenedBSD/src f5a77dcsys/modules/iwlwifi Makefile, sys/modules/rtw89 Makefile

iwlwifi/rtw89: improve module Makefile dependency on ACPI

In order to compile iwlwifi(4) and rtw89(4) on RISC-V [1] make the
currently manually tracked ACPI support option automatic based on
DEV_ACPI.
rtw89(4) is missing proper CONFIG_ACPI checks in the driver (or the
mandatory dependency on ACPI) even upstream it seems.  We just added
that check to the modules/Makefile until this is fixed.

[1] https://mail-archive.freebsd.org/cgi/getmsg.cgi?fetch=5947+0+archive/2026/freebsd-wireless/20260112.freebsd-wireless

Sponosred by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D54694
DeltaFile
+11-2sys/modules/rtw89/Makefile
+5-2sys/modules/iwlwifi/Makefile
+16-42 files

HardenedBSD/src c71f189sys/compat/linuxkpi/common/include/linux acpi.h

LinuxKPI: include acpi headers for RISC-V

In order to compile iwlwifi(4), which is reported to work on RISC-V,
include the ACPI headers to avoid adding further FreeBSD-specific #ifdefs
to the driver.  With this iwlwifi(4) just compiles on RISC-V (at least
if ACPI support is turned off in the module Makefile).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D54692
DeltaFile
+1-1sys/compat/linuxkpi/common/include/linux/acpi.h
+1-11 files

HardenedBSD/src 0fa7b3bsys/riscv/include acpica_machdep.h

riscv: add (a dummy) acpica_machdep.h

We have reports that iwlwifi(4) works on RISC-V.  While we can turn off
full ACPI-specific files easily, intermittent code still relies on the
header files to be present.  In order to not need to completely #ifdef
everything out we want to include acpi.h from LinuxKPI and as a result
need this file.  With this the iwlwifi(4) code compiles just fine and
will do the right thing (given the functional ACPI parts are disabled/
unavailable).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    mhorne, emaste
Differential Revision: https://reviews.freebsd.org/D54691
DeltaFile
+19-0sys/riscv/include/acpica_machdep.h
+19-01 files

HardenedBSD/src 3ea97c9libexec/rtld-elf debug.h

rtld: Switch to using <assert.h> for assert

The stock assert() works because rtld-libc includes a custom
implementation of __assert().

Reviewed by:    imp, kib
Obtained from:  CheriBSD
Sponsored by:   AFRL, DARPA
Differential Revision:  https://reviews.freebsd.org/D54712
DeltaFile
+1-4libexec/rtld-elf/debug.h
+1-41 files

HardenedBSD/src e96ec1alibexec/rtld-elf rtld.c rtld.h

rtld: Use uintptr_t instead of Elf_Addr for init/fini function pointers

This is a no-op on non-CHERI architectures, but is required for CHERI
where Elf_Addr is only an address and not a complete pointer.

While here, consistently use `uintptr_t *` for arrays of init/fini
function pointers.

Reviewed by:    imp, kib
Effort:         CHERI upstreaming
Obtained from:  CheriBSD
Sponsored by:   AFRL, DARPA
Differential Revision:  https://reviews.freebsd.org/D54711
DeltaFile
+20-22libexec/rtld-elf/rtld.c
+5-5libexec/rtld-elf/rtld.h
+25-272 files

HardenedBSD/src 31a440alibexec/rtld-elf rtld.c map_object.c, libexec/rtld-elf/powerpc reloc.c

rtld: Simplify walking program headers

Store phnum in Obj_Entry instead of phsize and use that to simplify
the terminate expressions when iterating over program headers.

Reviewed by:    kib
Obtained from:  CheriBSD
Sponsored by:   AFRL, DARPA
Differential Revision:  https://reviews.freebsd.org/D54710
DeltaFile
+8-10libexec/rtld-elf/rtld.c
+1-3libexec/rtld-elf/powerpc64/reloc.c
+1-3libexec/rtld-elf/powerpc/reloc.c
+1-1libexec/rtld-elf/map_object.c
+1-1libexec/rtld-elf/rtld.h
+12-185 files

HardenedBSD/src 2a5c5b8lib/libc/string swab.c

swab: Correctly treat the data as misaligned

The __aligned attribute in the previous version applied to the location
of the pointers, not the data the pointers pointed to.  While this
could be fixed by applying the attribute to a local typedef of uint16_t,
just using memcpy() for the unaligned access is simpler and ISO C.

This fixes the build on CHERI architectures which do not support
misaligned pointers and were thus failing with:

lib/libc/string/swab.c:12:18: error: alignment (1) of 'const uint16_t *' (aka 'const unsigned short *') is less than the required capability alignment (16) [-Werror,-Wcheri-capability-misuse]
   12 |         const uint16_t *f __aligned(1) = from;
      |

Co-authored by: Jessica Clarke <jrtc27 at FreeBSD.org>
Fixes:          02ebbc781f08 ("swab: Fix implementation to support overlapping copies")
Sponsored by:   AFRL, DARPA

Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D54399
DeltaFile
+10-3lib/libc/string/swab.c
+10-31 files

HardenedBSD/src fef84fdlib/libexecinfo/tests sigtramp_test.c

libexecinfo: tests: Expect failure on aarch64

Add a guard that expects a failure of the test on aarch64.

Reviewed by:    emaste
Fixes:          df1ea5887326 ("tests: Test libexecinfo backtrace call througth signal trampoline")
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54675
DeltaFile
+8-0lib/libexecinfo/tests/sigtramp_test.c
+8-01 files

HardenedBSD/src fd26fb8.github CODEOWNERS

CODEOWNERS: Add jlduran as a blocklist CODEOWNER

Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D54696
DeltaFile
+4-0.github/CODEOWNERS
+4-01 files

HardenedBSD/src 9c4a41dshare/man/man4 mca.4 Makefile

mca(4): Add man page

Reviewed by:    markj
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D54115
DeltaFile
+277-0share/man/man4/mca.4
+2-0share/man/man4/Makefile
+279-02 files

HardenedBSD/src 6f41575share/man/man7 tuning.7

tuning.7: wording fixes

Submitted by:   markj
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54572
DeltaFile
+2-2share/man/man7/tuning.7
+2-21 files

HardenedBSD/src 8cd687ashare/man/man7 tuning.7

tuning.7: use the correct word for collapsing

Fixes: 457b940bfb6a228af1281f357b627ecf1e26fea5
Signed-off-by: Oliver Pinter <oliver.pntr+freebsd at gmail.com>
MFC after:      1 week
DeltaFile
+1-1share/man/man7/tuning.7
+1-11 files

HardenedBSD/src 52d19dfcontrib/nvi/common extern.h, contrib/nvi/ex extern.h

nvi: import version 2.2.2
DeltaFile
+0-444usr.bin/vi/extern.h
+145-0contrib/nvi/vi/extern.h
+145-0usr.bin/vi/vi_extern.h
+131-0contrib/nvi/common/extern.h
+131-0contrib/nvi/ex/extern.h
+131-0usr.bin/vi/common_extern.h
+683-44427 files not shown
+1,179-58133 files

HardenedBSD/src b848037etc/mtree BSD.usr.dist

mtree: usr: Add missing pkg/triggers entry

Reviewed by:    ivy
Fixes:          ea5e50c2985b ("packages: Add a mandoc package")
Differential Revision:  https://reviews.freebsd.org/D54682
DeltaFile
+4-0etc/mtree/BSD.usr.dist
+4-01 files

HardenedBSD/src 0d9fd06etc/mtree BSD.debug.dist

gdb: Add missing mtree debug entry

Reviewed by:    markj
Fixes:          ea675a43f09b ("libexec/kgdb: Add new modules and install them together with debug info")
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54680
DeltaFile
+2-0etc/mtree/BSD.debug.dist
+2-01 files

HardenedBSD/src 3110ba7. CMakeLists.txt, common extern.h options_def.h

Vendor import nvi 2.2.2
DeltaFile
+145-0vi/extern.h
+131-0ex/extern.h
+131-0common/extern.h
+86-0common/options_def.h
+76-0ex/ex_def.h
+34-33CMakeLists.txt
+603-3320 files not shown
+740-13526 files

HardenedBSD/src 68ad2b0contrib/ncurses configure aclocal.m4, contrib/ncurses/doc/html ncurses-intro.html

ncurses: merge update to ncurses 6.6

6.6 is ABI compatible with 6.5 (tested with abidiff)
Remove html documentation to ease updates

MFC After:      1 month
DeltaFile
+15,906-15,332contrib/ncurses/configure
+2,456-1,968contrib/ncurses/misc/terminfo.src
+0-3,390contrib/ncurses/doc/html/ncurses-intro.html
+0-2,282contrib/ncurses/ncurses/win32con/win_driver.c
+853-527contrib/ncurses/aclocal.m4
+639-518contrib/ncurses/announce.html.in
+19,854-24,017411 files not shown
+40,960-36,365417 files

HardenedBSD/src 7aa8c69sbin/pfctl pfctl.c parse.y, sys/net pfvar.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+786-6sys/netpfil/pf/pf_ioctl.c
+642-96sbin/pfctl/pfctl.c
+678-4sys/netpfil/pf/pf.c
+525-3sbin/pfctl/parse.y
+415-0sys/netpfil/pf/pf_nl.c
+396-3sys/net/pfvar.h
+3,442-11218 files not shown
+4,563-11924 files

HardenedBSD/src c5a1e08. configure, Ada95 configure

Vendor import ncurses 6.6
DeltaFile
+15,906-15,332configure
+4,432-3,186Ada95/configure
+2,637-2,084test/configure
+2,456-1,968misc/terminfo.src
+2,089-1,937doc/html/NCURSES-Programming-HOWTO.html
+0-2,282ncurses/win32con/win_driver.c
+27,520-26,789756 files not shown
+62,770-50,521762 files

HardenedBSD/src b1281c6share/misc pci_vendors

pci_vendors: update to 2025-10-18

(cherry picked from commit e5f545e0d872fbfdb6c3c94ca81e7f3bce9d094a)
DeltaFile
+6-2share/misc/pci_vendors
+6-21 files

HardenedBSD/src da8c96fshare/misc usb_vendors

usb_vendors: update to 2025-09-15

(cherry picked from commit 90cd623611b22e2e484b800743845b38d9c20250)
DeltaFile
+9-2share/misc/usb_vendors
+9-21 files