HardenedBSD/src 4fd72edkrb5/lib/gssapi version.map, krb5/lib/krb5 version.map

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,192-0krb5/lib/krb5/version.map
+308-0krb5/lib/gssapi/version.map
+148-0krb5/plugins/kdb/db2/version.map
+139-5usr.sbin/cron/cron/do_command.c
+110-27lib/libsys/socket.2
+128-0krb5/plugins/preauth/pkinit/version.map
+2,025-3290 files not shown
+2,690-30596 files

HardenedBSD/src 573d7bflib/libsys socket.2, share/man/man7 simd.7

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+110-27lib/libsys/socket.2
+12-15sys/compat/linuxkpi/common/include/linux/ieee80211.h
+24-0sys/compat/linuxkpi/common/include/linux/netdevice.h
+21-0sys/net80211/ieee80211_radiotap.h
+15-2sys/compat/linuxkpi/common/include/net/mac80211.h
+5-4share/man/man7/simd.7
+187-485 files not shown
+203-5211 files

HardenedBSD/src f1d7eeasys/compat/linuxkpi/common/include/linux skbuff.h

LinuxKPI: skbuff: implement skb_queue_splice()

Add skb_queue_splice() and use it in skb_queue_splice_init() which
already had that functionality (plus the init bit).
The new function is used by rtw89(4).

Sponosred by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+8-1sys/compat/linuxkpi/common/include/linux/skbuff.h
+8-11 files

HardenedBSD/src 275c7f5sys/compat/linuxkpi/common/include/linux netdevice.h

LinuxKPI: netdevice: add structs net_device_path, net_device_path_ctx

mt76(4) is using this along with a mac80211.h functiontion pointer to
resolve a path in an offload case.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+24-0sys/compat/linuxkpi/common/include/linux/netdevice.h
+24-01 files

HardenedBSD/src d4898c6sys/compat/linuxkpi/common/include/linux ieee80211.h, sys/compat/linuxkpi/common/include/net mac80211.h cfg80211.h

LinuxKPi: 802.11: add more defines

Add more defines and a mac80211 op function pointer used by
mt76(4) at Linux v6.19-rc6.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+2-0sys/compat/linuxkpi/common/include/net/mac80211.h
+1-0sys/compat/linuxkpi/common/include/net/cfg80211.h
+1-0sys/compat/linuxkpi/common/include/linux/ieee80211.h
+4-03 files

HardenedBSD/src e4a4841sys/compat/linuxkpi/common/include/linux ieee80211.h

LinuxKPI: 802.11: Management MIC element can have 8 or 16 octets MIC

Management MIC element (MME) can have 8 or 16 octets MIC.  Add a second
structure used by at least iwlwifi and update reference to latest
standard version.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+11-3sys/compat/linuxkpi/common/include/linux/ieee80211.h
+11-31 files

HardenedBSD/src 5f7b5ddsys/net80211 ieee80211_radiotap.h

radiotap: add more EHT definitions

Add more EHT definitions used by at least iwlwifi.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+21-0sys/net80211/ieee80211_radiotap.h
+21-01 files

HardenedBSD/src b2c90d1sys/compat/linuxkpi/common/include/linux ieee80211.h, sys/compat/linuxkpi/common/include/net mac80211.h

LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file

What we used to call enum ieee80211_tx_rate_flags is now used as
enum mac80211_rate_control_flags for the ieee80211_tx_rate.flags
in rtw89(4).  Rename the enum and move it to mac80211 as it seems
to belong there.

Sponsonred by:  The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+13-2sys/compat/linuxkpi/common/include/net/mac80211.h
+0-12sys/compat/linuxkpi/common/include/linux/ieee80211.h
+13-142 files

HardenedBSD/src 18de283sys/compat/linuxkpi/common/include/net cfg80211.h

LinuxKPI: 802.11: add new field to struct cfg80211_bitrate_mask

rtw89(4) accesses eht_mcs[].
Add the field to struct cfg80211_bitrate_mask.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+3-0sys/compat/linuxkpi/common/include/net/cfg80211.h
+3-01 files

HardenedBSD/src 2c6bee2lib/libsys socket.2

socket.2: Cross-reference protocol families

While here, make wider use of Dv for socket types and protocol families
and reference fcntl(2) flags for the `type` argument values.

MFC after:              3 days
Reviewed by:            glebius, ziaee
Differential Revision:  https://reviews.freebsd.org/D54434
DeltaFile
+110-27lib/libsys/socket.2
+110-271 files

HardenedBSD/src 98cb487share/man/man7 simd.7

simd.7: Add Arm MOPS memcpy(), memmove() and memset() to manpage

Fixes:                  41ccf82b29f3 (Use MOPS implementations)
Reviewed by:            ziaee
Sponsored by:           Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D54812
DeltaFile
+5-4share/man/man7/simd.7
+5-41 files

HardenedBSD/src 5eb1d4esys/rpc/rpcsec_tls rpctls_impl.c

rpctls_impl.c: Use a direct cast to uintptr_t instead of __DECONST

This fixes the build on CHERI architectures where the compiler warns
about a direct cast between uint64_t and const void * inside of
__DECONST.  However, GCC would also complain about this on 32-bit
kernels due to uint64_t not being the same size as a pointer.  Also,
a direct cast to uintptr_t to right-size the cookie value is more
direct than using __DECONST given that there is no "const" pointer
involved in the expression.

Reviewed by:    brooks, glebius
Obtained from:  CheriBSD
Sponsored by:   AFRL, DARPA
Differential Revision:  https://reviews.freebsd.org/D54797
DeltaFile
+1-1sys/rpc/rpcsec_tls/rpctls_impl.c
+1-11 files

HardenedBSD/src 0ba2b8dshare/man/man5 src.conf.5

HBSD: Resolve merge conflict

Regen src.conf.5.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-5share/man/man5/src.conf.5
+1-51 files

HardenedBSD/src 2bee4bblibexec/rc/rc.d Makefile, sbin/devd Makefile

src.opts: Introduce MK_SOUND

PR:             291853
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    zarychtam_plan-b.pwste.edu.pl, markj
Differential Revision:  https://reviews.freebsd.org/D54456

(cherry picked from commit f74f891581bc4df20431607de9b761107f6a0aa7)
(cherry picked from commit 37164224eefd11278b0203e1367e1d9d1454da3f)
(cherry picked from commit 241a43cf9da8933f500e7d0df7fff621fd52168c)
(cherry picked from commit cf34eb8264954a8fd1e92081bcf67719bddbc2aa)
(cherry picked from commit 466bad427d74e666e85445729b2e63b82e10d18f)
DeltaFile
+13-0tools/build/mk/OptionalObsoleteFiles.inc
+7-5sbin/devd/Makefile
+4-4libexec/rc/rc.d/Makefile
+6-1share/man/man5/src.conf.5
+6-0share/mk/src.opts.mk
+3-3usr.sbin/Makefile
+39-134 files not shown
+48-1710 files

HardenedBSD/src 4791738sys/dev/sound/midi midi.c midiq.h, sys/dev/sound/pci hdspe-pcm.c cs4281.c

sound: Replace MIN() with min()

We use min() in most places.

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit eccd366b0a8ba7d902fcf0b1bec447926a75c36c)
DeltaFile
+5-5sys/dev/sound/midi/midi.c
+2-2sys/dev/sound/pci/hdspe-pcm.c
+2-2sys/dev/sound/usb/uaudio.c
+2-2sys/dev/sound/midi/midiq.h
+1-1sys/dev/sound/pci/cs4281.c
+12-125 files

HardenedBSD/src 17ed747usr.sbin/sndctl sndctl.c sndctl.8

sndctl(8): Add libxo support

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    ziaee, mckusick
Differential Revision:  https://reviews.freebsd.org/D54032

(cherry picked from commit aa58af04dc88aabf9d2fade2c7d126031cb66f42)
DeltaFile
+100-51usr.sbin/sndctl/sndctl.c
+10-1usr.sbin/sndctl/sndctl.8
+1-1usr.sbin/sndctl/Makefile
+111-533 files

HardenedBSD/src 0d33cddsys/dev/sound/midi midi.c

sound: Unlock around uiomove() in midi_{read,write}()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D54130

(cherry picked from commit 6b69d6726a7d3455fb295abfcf9aedd48c580d4a)
DeltaFile
+6-2sys/dev/sound/midi/midi.c
+6-21 files

HardenedBSD/src dfbc454krb5/lib/gssapi version.map, krb5/lib/krb5 version.map

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+1,192-0krb5/lib/krb5/version.map
+308-0krb5/lib/gssapi/version.map
+148-0krb5/plugins/kdb/db2/version.map
+139-5usr.sbin/cron/cron/do_command.c
+128-0krb5/plugins/preauth/pkinit/version.map
+88-24sys/compat/linuxkpi/common/src/linux_80211.c
+2,003-2981 files not shown
+2,490-25287 files

HardenedBSD/src 37de376.github CODEOWNERS

CODEOWNERS: Add myself for openssh and makefs
DeltaFile
+2-1.github/CODEOWNERS
+2-11 files

HardenedBSD/src 76ca619. MAINTAINERS

MAINTAINERS: remove stale entry
DeltaFile
+1-1MAINTAINERS
+1-11 files

HardenedBSD/src d8b8dc7sys/dev/dpaa2 dpaa2_ni.c

dpaa2: cleanup

No functional change intended.

Reviewed by:            bz, dsl
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D54805
DeltaFile
+4-20sys/dev/dpaa2/dpaa2_ni.c
+4-201 files

HardenedBSD/src a42b3cfetc/mtree BSD.debug.dist, lib/libexecinfo/tests sigtramp_test.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+8-0lib/libexecinfo/tests/sigtramp_test.c
+2-0etc/mtree/BSD.debug.dist
+10-02 files

HardenedBSD/src 53d6b23usr.sbin/cron/cron cron.8

cron.8: clarify system crontab format

PR:             234504
MFC after:      1 week
DeltaFile
+6-5usr.sbin/cron/cron/cron.8
+6-51 files

HardenedBSD/src 21a7a9esys/powerpc/mpc85xx pci_mpc85xx.c

powerpc/mpc85xx: Fix PCI attach error cleanup

If an error occurs during attach after ofw_pcib_init() runs, the device
is torn down, leaving the rmans embedded in the softc attached to the
rman list, thus corrupting the rman list.  Fix this by undoing
everything that was done by this point.

MFC after:      1 week
DeltaFile
+17-2sys/powerpc/mpc85xx/pci_mpc85xx.c
+17-21 files

HardenedBSD/src 24d048bsys/powerpc/mpc85xx platform_mpc85xx.c

powerpc/mpc85xx: Set pc_hwref to the primary thread ID

On multithreaded cores (e6500) the CPU ID in the device tree (reg[0]) is
the primary core, which may not match the cpuid, until Book-E threading
is added.
DeltaFile
+14-2sys/powerpc/mpc85xx/platform_mpc85xx.c
+14-21 files

HardenedBSD/src c611ef5sys/dev/dpaa qman_fdt.c bman_fdt.c

dpaa: Simplify CPU binding for bman and qman

If cpu-handle property doesn't exist simply iterate and assign the CPUs
in sequence rather than following the convoluted search which may not
bear fruit in some cases.  If cpu-handle doesn't exist for one portal it
probably doesn't exist for any of them.
DeltaFile
+9-31sys/dev/dpaa/qman_fdt.c
+9-30sys/dev/dpaa/bman_fdt.c
+18-612 files

HardenedBSD/src 12444a4lib/libpam/pam.d cron, usr.sbin/cron/cron do_command.c

cron: Implement full PAM session lifecycle for user jobs

Extend PAM integration beyond account checks to include credential
establishment and session management, allowing PAM modules to configure
the execution environment for user cron jobs.

Previously, cron only called pam_acct_mgmt() to verify account validity
but immediately terminated the PAM handle before job execution. This
prevented PAM modules from establishing sessions, setting credentials
(e.g., Kerberos tickets), or exporting environment variables needed by
jobs.

The PAM handle now persists in the intermediate process throughout the
job execution, enabling proper session open/close pairing. Credentials
are established and sessions opened while still running as root, before
dropping privileges in the grandchild. PAM environment variables are
exported in the job process with user crontab variables taking precedence.

A session rule (pam_permit.so) is added to /etc/pam.d/cron to enable

    [9 lines not shown]
DeltaFile
+139-5usr.sbin/cron/cron/do_command.c
+3-0lib/libpam/pam.d/cron
+142-52 files

HardenedBSD/src 9f90e5alib/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

(cherry picked from commit fef84fd8ae845e19cec0f6b9aac0e6451cca3d7a)
DeltaFile
+8-0lib/libexecinfo/tests/sigtramp_test.c
+8-01 files

HardenedBSD/src 27bf077etc/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

(cherry picked from commit 0d9fd06b03e06ae642fa54510473b15361034a54)
DeltaFile
+2-0etc/mtree/BSD.debug.dist
+2-01 files

HardenedBSD/src 053449fsys/fs/nfsclient nfs_clrpcops.c

nfscl: Fix the build

Fixes:  f2155a6fb568 ("nfscl: Fix handling of case insensitive file systems")
DeltaFile
+2-1sys/fs/nfsclient/nfs_clrpcops.c
+2-11 files