HardenedBSD/src f0f1e6bcddl/contrib/opensolaris/cmd/dtrace dtrace.1, share/man/man4 dtrace_pid.4 Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+99-0share/man/man4/dtrace_pid.4
+5-2sys/kern/kern_jail.c
+5-1share/man/man7/ports.7
+3-2cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+2-2sys/modules/iwlwifi/Makefile
+1-0share/man/man4/Makefile
+115-76 files

HardenedBSD/src 6ef120elib/libc/sys mkdir.2, usr.bin/find find.1

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+1-1lib/libc/sys/mkdir.2
+1-1usr.bin/find/find.1
+2-22 files

HardenedBSD/src 8e5464csys/dev/random random_harvestq.c, sys/dev/random/fenestrasX fx_pool.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+11-1sys/dev/random/fenestrasX/fx_pool.c
+4-2sys/dev/random/random_harvestq.c
+15-32 files

HardenedBSD/src d53618dsys/dev/random random_harvestq.c, sys/dev/random/fenestrasX fx_pool.c

random: CTASSERT check sizeof random_source_descr[]

Ensure that the number of elements of random_source_descr[]
and fxrng_ent_char[] matches that of enum random_entropy_source.

Reviewed by:    cem
Differential Revision: https://reviews.freebsd.org/D53255
(cherry picked from commit 8bd9a9e9e4cb3e293c1639319692ce201eb8fc53)
DeltaFile
+4-2sys/dev/random/random_harvestq.c
+2-1sys/dev/random/fenestrasX/fx_pool.c
+6-32 files

HardenedBSD/src 3a9bcf8sys/dev/random/fenestrasX fx_pool.c

random: fenestrasX: Add missing entropy sources

Reviewed by: cem
Fixes: 1492c8c0d qcom_rnd: add initial qualcomm prng driver.
Fixes: 9eecef052 Add an Armv8 rndr random number provider
Fixes: b2f8b2dc8 sys: Add an SMCCC Random Number Generator driver
Differential Revision:  https://reviews.freebsd.org/D53292
(cherry picked from commit 93b02f69a6f6ffb833227c2fd56d48daac128156)
DeltaFile
+9-0sys/dev/random/fenestrasX/fx_pool.c
+9-01 files

HardenedBSD/src 753cef7cddl/contrib/opensolaris/cmd/dtrace dtrace.1

dtrace.1: Fix mdoc macros around -x

There should be no space between -x's "arg" and "=value".

MFC after:      3 days
DeltaFile
+1-1cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+1-11 files

HardenedBSD/src 9fe88e5cddl/contrib/opensolaris/cmd/dtrace dtrace.1, share/man/man4 dtrace_pid.4 Makefile

dtrace_pid.4: Document the DTrace PID provider

MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D51287
DeltaFile
+99-0share/man/man4/dtrace_pid.4
+2-1cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+1-0share/man/man4/Makefile
+102-13 files

HardenedBSD/src b8ff8a1share/man/man7 ports.7

ports.7: Add /var/db/ports to FILES

PR:             272426
MFC after:      3 days
Co-authored-by: Piotr Smyrak <ps.ports at smyrak.com>
DeltaFile
+5-1share/man/man7/ports.7
+5-11 files

HardenedBSD/src 37989eflib/libc/sys mkdir.2

mkdir.2: Correct HISTORY

PR:             286064
MFC after:      3 days
Reviewed by:    mckusick

(cherry picked from commit 26069bca2d64a76cfafb92d61d58c90140c1b28f)
DeltaFile
+1-1lib/libc/sys/mkdir.2
+1-11 files

HardenedBSD/src 2ec6a2esys/modules/iwlwifi Makefile

iwlwifi: fix the gcc build

- Only apply the previously added CWARNFLAGS to `drv.c` instead of the
  whole module.
- Only apply `-Wno-initializer-overrides` to CWARNFLAGS in the clang
  scenario as it's not supported with gcc.

This fixes building the module with gcc and avoids accidentally
introducing tech debt with the module, in the event other issues are
accidentally introduced.

MFC after:      3 days
Fixes:          6b627f8858 ("iwlwifi: update Intel's mvm/mld drivers")
Differential Revision:  https://reviews.freebsd.org/D53591
DeltaFile
+2-2sys/modules/iwlwifi/Makefile
+2-21 files

HardenedBSD/src 3f5f522sys/kern kern_jail.c

kern_jail_set(): do not double-free opts

If vfs_buildopts() failed, vfs_freeopts() must not be called.

Reported and tested by: pho
Reviewed by:    jamie
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D53612
DeltaFile
+5-2sys/kern/kern_jail.c
+5-21 files

HardenedBSD/src d4824d1usr.bin/find find.1

find.1: Correct HISTORY grammar typo

PR:             286292
MFC after:      3 days
Reviewed by:    ziaee

(cherry picked from commit b87dcd7004993417cf711f20a0924e3a768ae116)
DeltaFile
+1-1usr.bin/find/find.1
+1-11 files

HardenedBSD/src e5be99frelease/packages/ucl googletest-all.ucl tests.ucl, stand/libsa/zfs zfsimpl.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+41-48usr.sbin/sysrc/sysrc.8
+72-0sys/cam/ata/ata_da.c
+54-13stand/libsa/zfs/zfsimpl.c
+15-39sys/kern/kern_prot.c
+33-0release/packages/ucl/googletest-all.ucl
+21-2release/packages/ucl/tests.ucl
+236-10221 files not shown
+322-17027 files

HardenedBSD/src 8e3d782sbin/dumpon dumpon.8, share/man/man4 ciss.4

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+41-48usr.sbin/sysrc/sysrc.8
+15-0sbin/dumpon/dumpon.8
+6-3share/man/man4/ciss.4
+62-513 files

HardenedBSD/src 2f365c1sbin/dumpon dumpon.8, share/man/man4 ice.4 ciss.4

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+252-178share/man/man4/ice.4
+41-48usr.sbin/sysrc/sysrc.8
+15-0sbin/dumpon/dumpon.8
+6-3share/man/man4/ciss.4
+4-1usr.bin/cut/cut.1
+318-2305 files

HardenedBSD/src b558ebbsys/cam/ata ata_da.c, sys/cam/scsi scsi_da.c

cam: Add a number of asserts to catch bad transactions

Ensure that we're in the right state / priority for each of the states
in the driver. These asserts assured that a prior patch that I committed
to fix a priority leak worked when a drive departed (and bounced back
too!). These have been running in our production since I committed the
change and haven't trigged.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D53259
DeltaFile
+72-0sys/cam/ata/ata_da.c
+21-0sys/cam/scsi/scsi_da.c
+93-02 files

HardenedBSD/src 920c94busr.sbin/sysrc sysrc.8

sysrc.8: Rewrite examples for mdoc conformance

Tag SPDX while here. This is not a content change, so do not bump date.

PR:             274164
MFC after:      3 seconds

(cherry picked from commit 3f0dd7724658126dcfde488a994cf7698353a82c)
DeltaFile
+41-48usr.sbin/sysrc/sysrc.8
+41-481 files

HardenedBSD/src 9a6e6e9usr.sbin/sysrc sysrc.8

sysrc.8: Rewrite examples for mdoc conformance

Tag SPDX while here. This is not a content change, so do not bump date.

PR:             274164
MFC after:      3 seconds

(cherry picked from commit 3f0dd7724658126dcfde488a994cf7698353a82c)
DeltaFile
+41-48usr.sbin/sysrc/sysrc.8
+41-481 files

HardenedBSD/src 3f0dd77usr.sbin/sysrc sysrc.8

sysrc.8: Rewrite examples for mdoc conformance

Tag SPDX while here. This is not a content change, so do not bump date.

PR:             274164
MFC after:      3 seconds
DeltaFile
+41-48usr.sbin/sysrc/sysrc.8
+41-481 files

HardenedBSD/src 396fac0sbin/dumpon dumpon.8

dumpon.8: use .Nm macro when refer to itself

Bump .Dd too while I am here.
DeltaFile
+2-2sbin/dumpon/dumpon.8
+2-21 files

HardenedBSD/src fa168bbshare/man/man4 ciss.4

ciss.4: Add p440ar to HARDWARE

PR:             290425
MFC after:      3 seconds, this fixes the HW relnotes
Reported by:    jwb

(cherry picked from commit a41ffaa330f5dbfc6b10f32ea2879755e07ba932)
DeltaFile
+6-3share/man/man4/ciss.4
+6-31 files

HardenedBSD/src 801f10bshare/man/man4 ciss.4

ciss.4: Add p440ar to HARDWARE

PR:             290425
MFC after:      3 seconds, this fixes the HW relnotes
Reported by:    jwb

(cherry picked from commit a41ffaa330f5dbfc6b10f32ea2879755e07ba932)
DeltaFile
+6-3share/man/man4/ciss.4
+6-31 files

HardenedBSD/src a41ffaashare/man/man4 ciss.4

ciss.4: Add p440ar to HARDWARE

PR:             290425
MFC after:      3 seconds, this fixes the HW relnotes
Reported by:    jwb
DeltaFile
+6-3share/man/man4/ciss.4
+6-31 files

HardenedBSD/src 7c87171sbin/dumpon dumpon.8

dumpon(8): Add a SYSCTL VARIABLES section

Document debug.minidump and machdep.dump_retry_count sysctl variables.

PR:                     259393
MFC after:              3 seconds
Reviewed by:            gbe (previous), markj, ziaee
Differential Revision:  https://reviews.freebsd.org/D32618

(cherry picked from commit 850841edf6c0867a170d2637f3dacfda33d5f3dd)
DeltaFile
+15-0sbin/dumpon/dumpon.8
+15-01 files

HardenedBSD/src 2608020sbin/dumpon dumpon.8

dumpon(8): Add a SYSCTL VARIABLES section

Document debug.minidump and machdep.dump_retry_count sysctl variables.

PR:                     259393
MFC after:              3 seconds
Reviewed by:            gbe (previous), markj, ziaee
Differential Revision:  https://reviews.freebsd.org/D32618

(cherry picked from commit 850841edf6c0867a170d2637f3dacfda33d5f3dd)
DeltaFile
+15-0sbin/dumpon/dumpon.8
+15-01 files

HardenedBSD/src 850841esbin/dumpon dumpon.8

dumpon(8): Add a SYSCTL VARIABLES section

Document debug.minidump and machdep.dump_retry_count sysctl variables.

PR:                     259393
MFC after:              3 seconds
Reviewed by:            gbe (previous), markj, ziaee
Differential Revision:  https://reviews.freebsd.org/D32618
DeltaFile
+15-0sbin/dumpon/dumpon.8
+15-01 files

HardenedBSD/src 6453523usr.sbin/freebsd-update freebsd-update.sh

freebsd-update: Swap pkg(8) flags in check_pkgbase()

Unbootstrapped pkg will ignore -N if -r is specified first.  Flip the
order.

Prior to commit 66c75fa63aff this worked by accident.

PR:             290393
Reported by:    olgeni
MFC after:      3 days
Fixes:          66c75fa63aff ("freebsd-update: Fix the pkgbase check")
DeltaFile
+1-1usr.sbin/freebsd-update/freebsd-update.sh
+1-11 files

HardenedBSD/src 4d6801astand/libsa/zfs zfsimpl.c, sys/cddl/boot/zfs zfsimpl.h

stand: Teach the zfs loader about dynamic gang headers

There is a pool feature, dynamic_gang_header, that is enabled by default
in new pools.  When this feature is active, gang headers may be larger
than 512 bytes.  The loader needs to be taught to cope with that.

Try using the vdev ashift to pick the gang block header size.  If the
checksum fails, fall back to the old gang block header size.

This is based on a patch by Paul Dagnelie, with testing, bug-fixing and
some simplifications from me.

PR:             289690
Co-authored by: Paul Dagnelie <paul.dagnelie at klarasystems.com>
Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53578
DeltaFile
+54-13stand/libsa/zfs/zfsimpl.c
+2-13sys/cddl/boot/zfs/zfsimpl.h
+56-262 files

HardenedBSD/src c55f179lib/ofed Makefile.inc

lib/ofed: Move to the rdma package

We have an existing rdma package for IB/rdma-related files, but most
of ofed isn't in that package, making it rather useless.  Move all of
lib/ofed to the rdma package.

Add a separate rdma-lib package using LIB_PACKAGE, since utilities
depends on the rdma libraries and we don't want that to pull in all
of rdma.

This change moves files between packages so, until we have a proper
policy on how to handle this in release/stable branches, it should
not be MFC'd.

PR:     263227
MFC after:      never
Reviewed by:    manu
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53604
DeltaFile
+3-0lib/ofed/Makefile.inc
+3-01 files

HardenedBSD/src 8a8f2ebetc/mtree BSD.usr.dist, etc/termcap Makefile

ncurses: Move termcap and tabset to ncurses-lib

termcap and tabset are currently in runtime, but since ncurses is the
only thing which uses them, they belong in the ncurses package.

curses without termcap is not very useful, so put them in the -lib
subpackage rather than ncurses itself, so that installing ncurses-lib
provides a working curses.

This change moves files between packages so, until we have a proper
policy on how to handle this in release/stable branches, it should
not be MFC'd.

MFC after:      never
Discussed with: kevans
Reviewed by:    manu, kevans
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53610
DeltaFile
+7-4share/termcap/Makefile
+3-1etc/termcap/Makefile
+2-0share/tabset/Makefile
+1-1etc/mtree/BSD.usr.dist
+13-64 files