HardenedBSD/src c9a1bd9lib/libmd/aarch64 md5block.S, lib/libmd/amd64 md5block.S

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+363-0lib/libmd/amd64/md5block.S
+0-341sys/kern/md5c.c
+317-0sys/crypto/md5c.c
+298-0sys/crypto/md4c.c
+0-298sys/kern/md4c.c
+206-0lib/libmd/aarch64/md5block.S
+1,184-6395 files not shown
+1,239-64611 files

HardenedBSD/src f5d9d17release/scripts pkg-stage.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1release/scripts/pkg-stage.sh
+1-11 files

HardenedBSD/src 371e1f8release/scripts pkg-stage.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1release/scripts/pkg-stage.sh
+1-11 files

HardenedBSD/src c8cf5a9release/scripts pkg-stage.sh

release: Ship DVD with only emacs at nox flavour

Contrary to the claim made in a previous commit, removing KDE and
adding all of vim and emacs results in an image which does not fit
into 4.7 GB; to be specific, it lands at 4.722 GB rather than the
claimed 4.689 GB.  (This descrepancy resulted from doing test DVD
image builds using an out-of-date tree, and became visible when the
15.0-RC3 images were built.)

Limit the emacs packages shipped on the DVD to the "nox" flavor;
this brings the disk image down to 4.407 GB, aka under the 4.7 GB
limit for standard DVDs.

Fixes:  6cc6beb4c889 ("release: Remove KDE from dvd1.iso")
MFC after:      1 day (for 15.0-RC4)
DeltaFile
+1-1release/scripts/pkg-stage.sh
+1-11 files

HardenedBSD/src 28a0f0clib/libmd Makefile, lib/libmd/amd64 md5block.S md5dispatch.c

lib/libmd: import md5 amd64 kernels

Differential Revision:  https://reviews.freebsd.org/D45670
Reviewed by:    imp
Approved by:    markj (mentor)
MFC after:      1 month

(cherry picked from commit d92e987421001c365216b039f8c3303939c195f7)
DeltaFile
+363-0lib/libmd/amd64/md5block.S
+41-0lib/libmd/amd64/md5dispatch.c
+7-0lib/libmd/Makefile
+411-03 files

HardenedBSD/src f0b9cf9stand/libsa Makefile, sys/crypto md5c.c

sys/crypto: import md5c.c C rewrite

The reimplementation is a bit cleaner than the original code,
although it is also slightly slower. This shouldn't matter too
much as we will have asm code for the major platforms.

The code is unrolled when built in the kernel or user space, but
not when in libsa, as to reduce the code size.

Differential Revision:  https://reviews.freebsd.org/D45670
Reviewed by:    jrtc27, imp
Approved by:    markj (mentor)
MFC after:      1 month

(cherry picked from commit 90fa789cfab54294d4c3a0ac74e01747ce074386)
DeltaFile
+283-307sys/crypto/md5c.c
+1-0stand/libsa/Makefile
+284-3072 files

HardenedBSD/src f7874falib/libmd/aarch64 md5block.S

lib/libmd: import aarch64 md5 SIMD implementation

Reviewed by:    andrew, imp
Approved by:    markj (mentor)
Differential Revision:  https://reviews.freebsd.org/D45670
MFC after:      1 month

(cherry picked from commit c1135b2b54bf46709120d98c90ff4d28a77b896c)
DeltaFile
+206-0lib/libmd/aarch64/md5block.S
+206-01 files

HardenedBSD/src 5a56661sys/conf files, sys/crypto md5c.c md4c.c

sys: move sys/kern/md[45].c to sys/crypto

Both files are used by kernel and userspace.
Move them to sys/crypto where they belong.

No functional changes intended.

In preparation of D45670.

Reviewed by:    markj
Approved by:    markj (mentor)
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D52909

(cherry picked from commit 73a9b273d3d315716304c2cc237fef3141a93f2a)
DeltaFile
+341-0sys/crypto/md5c.c
+0-341sys/kern/md5c.c
+0-298sys/kern/md4c.c
+298-0sys/crypto/md4c.c
+2-2sys/modules/smbfs/Makefile
+2-2sys/conf/files
+643-6432 files not shown
+645-6468 files

HardenedBSD/src 7f52f9cshare/keys/pkgbase-15/trusted Makefile backup-signing-15

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-1share/keys/pkgbase-15/trusted/Makefile
+2-0share/keys/pkgbase-15/trusted/backup-signing-15
+4-12 files

HardenedBSD/src 1daae5fshare/keys/pkgbase-15/trusted Makefile backup-signing-15

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-1share/keys/pkgbase-15/trusted/Makefile
+2-0share/keys/pkgbase-15/trusted/backup-signing-15
+4-12 files

HardenedBSD/src 9ef5049share/keys/pkgbase-15/trusted Makefile backup-signing-15, sys/fs/nfs nfs_commonsubs.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-1share/keys/pkgbase-15/trusted/Makefile
+1-2sys/fs/nfs/nfs_commonsubs.c
+2-0share/keys/pkgbase-15/trusted/backup-signing-15
+5-33 files

HardenedBSD/src a36c71asys/fs/nfs nfs_commonsubs.c

nfs_commonsubs.c: Get rid of variable used as a constant

The variable ncl_mbuf_mhlen is set to MHLEN and only
used in one place.  This patch simply deletes it and
replaces it with MHLEN.

This patch should not affect semantics.

Spotted while fixing cases that could do large
NFSM_DISSECT() sizes.

(cherry picked from commit 73551cd6eac29a6707c802c7d7fafcb560bf5e2b)
DeltaFile
+1-2sys/fs/nfs/nfs_commonsubs.c
+1-21 files

HardenedBSD/src 696b0e2share/keys/pkgbase-15/trusted Makefile backup-signing-15

Add backup pkgbase signing key held by security-officer.

This key was generated by gordon@ (aka security-officer@) on an offline
system as a backup key should anything happen to the AWS Key
Management Service that is currently in use for signing pkgbase
repositories for FreeBSD 15.x.

Reviewed by:    cperciva
With hat:       so

(cherry picked from commit 12ec49d8fac2eacd40ad235bf73cc585736ee77a)
DeltaFile
+2-1share/keys/pkgbase-15/trusted/Makefile
+2-0share/keys/pkgbase-15/trusted/backup-signing-15
+4-12 files

HardenedBSD/src 12ec49dshare/keys/pkgbase-15/trusted Makefile backup-signing-15

Add backup pkgbase signing key held by security-officer.

This key was generated by gordon@ (aka security-officer@) on an offline
system as a backup key should anything happen to the AWS Key
Management Service that is currently in use for signing pkgbase
repositories for FreeBSD 15.x.

Reviewed by:    cperciva
With hat:       so
DeltaFile
+2-1share/keys/pkgbase-15/trusted/Makefile
+2-0share/keys/pkgbase-15/trusted/backup-signing-15
+4-12 files

HardenedBSD/src 1cb1c89libexec/nuageinit nuageinit, sys/dev/ice ice_rss.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+41-25sys/net/rss_config.c
+29-26usr.bin/beep/beep.1
+19-13libexec/nuageinit/nuageinit
+8-21sys/dev/vmware/vmxnet3/if_vmx.c
+4-24sys/dev/ice/ice_rss.h
+11-10usr.bin/beep/beep.c
+112-11934 files not shown
+175-28840 files

HardenedBSD/src ecd2444libexec/nuageinit nuageinit, sys/dev/ice ice_rss.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+41-25sys/net/rss_config.c
+29-26usr.bin/beep/beep.1
+19-13libexec/nuageinit/nuageinit
+8-21sys/dev/vmware/vmxnet3/if_vmx.c
+4-24sys/dev/ice/ice_rss.h
+11-10usr.bin/beep/beep.c
+112-11934 files not shown
+175-28840 files

HardenedBSD/src 7be6055sys/dev/nvme nvme_ctrlr.c, tests/sys/fs/fusefs notify.cc mockfs.cc

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+56-0tests/sys/fs/fusefs/notify.cc
+24-0sys/dev/nvme/nvme_ctrlr.c
+11-7tests/sys/netpfil/pf/sctp.sh
+6-3tests/sys/fs/fusefs/mockfs.cc
+6-1tests/sys/fs/fusefs/bad_server.cc
+6-1tests/sys/fs/fusefs/mockfs.hh
+109-124 files not shown
+122-1310 files

HardenedBSD/src 8454c1ebin/cp cp.c, bin/cp/tests cp_test.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+24-0sys/dev/nvme/nvme_ctrlr.c
+11-7tests/sys/netpfil/pf/sctp.sh
+15-0bin/cp/tests/cp_test.sh
+6-1bin/cp/cp.c
+5-0sys/dev/nvme/nvme_ns.c
+1-0sys/dev/nvme/nvme_private.h
+62-86 files

HardenedBSD/src 9128380sys/arm64/arm64 mp_machdep.c

Revert "arm64: Move intr_pic_init_secondary earlier"

It's not clear what the race described in the commit actually is, nor
how it could arise, but this commit is definitely wrong; curthread is no
longer set for intr_pic_init_secondary, and gic_v3's pic_init_secondary
uses mutex(9) in some places, which requires curthread, so it has led to
panics. Revert this change until the original issue this was intended to
be fixed can be more thorougly investigated and a better fix made.

Reported by:    Herbert J. Skuhra <herbert at gojira.at>, jhb

This reverts commit a695ac2ce8bc8e8b989359002659063f2e056dcf.
DeltaFile
+2-2sys/arm64/arm64/mp_machdep.c
+2-21 files

HardenedBSD/src c4843e5bin/cp cp.c, bin/cp/tests cp_test.sh

cp: Fix copying the root directory

When the source of the copy operation is the root directory, we should
neither append it to the destination path on FTS_D nor trim it back off
on FTS_DP.

PR:             291132
MFC after:      3 days
Fixes:          82fc0d09e862 ("cp: Partly restore symlink folllowing.")
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D53863

(cherry picked from commit fe836c50120daed3e4084f43c27d8d650d36dee8)
DeltaFile
+15-0bin/cp/tests/cp_test.sh
+6-1bin/cp/cp.c
+21-12 files

HardenedBSD/src 1b5cc3csys/dev/nvme nvme_ctrlr.c nvme_ns.c

nvme: add support for DIOCGIDENT

Add support for the DIOCGIDENT ioctl to both nvme controller device
nodes and namespace device nodes.

This information was already available via the nda(4) device node.
However, mapping /dev/nvmeX to /dev/ndaY device nodes is not
straightforward, so it's better to get it directly from the /dev/nvme
device node.

PR:             290259
Sponsored by:   ConnectWise
Submitted by:   imp (mostly)
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1875

(cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3)
DeltaFile
+24-0sys/dev/nvme/nvme_ctrlr.c
+5-0sys/dev/nvme/nvme_ns.c
+1-0sys/dev/nvme/nvme_private.h
+30-03 files

HardenedBSD/src 55de86dsys/contrib/device-tree/src/arm64/rockchip rk356x-base.dtsi rk3568.dtsi

dts: Revert its addition for rk356x

Rockchip have two erratas (#3568001 and #3568002) for the GIC on RK356x.

Until we have a way to handle them revert the changes that uses ITS instead of
GIC for PCIe.
DeltaFile
+1-13sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi
+4-4sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi
+5-172 files

HardenedBSD/src 55d98b0usr.bin/beep beep.1 beep.c

beep: Sort usage and man page options

Sort usage and man page options, mention possible minimum and maximum
values, fix punctuation marks, and cleanup the man page.

PR:             291092
Reviewed by:    pauamma_gundo.com, christos
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53827
DeltaFile
+29-26usr.bin/beep/beep.1
+11-10usr.bin/beep/beep.c
+40-362 files

HardenedBSD/src 57d25b6libexec/nuageinit nuageinit

nuageinit: Add guards against empty user data

Add guards against attempting to process a user data file with an empty
first line or contents.

PR:             290395
Reviewed by:    bapt (earlier), dtxdf, markj
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53239
DeltaFile
+8-0libexec/nuageinit/nuageinit
+8-01 files

HardenedBSD/src 81af04blibexec/nuageinit nuageinit nuage.lua, libexec/nuageinit/tests addfile.lua nuageinit.sh

nuageinit: Silence luacheck warnings and fix typos

No functional change intended.

Reviewed by:    bapt, dtxdf, kevans
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53238
DeltaFile
+11-13libexec/nuageinit/nuageinit
+2-4libexec/nuageinit/nuage.lua
+1-1libexec/nuageinit/tests/addfile.lua
+1-1libexec/nuageinit/tests/nuageinit.sh
+15-194 files

HardenedBSD/src 35bff21tests/sys/netpfil/pf sctp.sh

tests/sys/netpfil/pf/sctp: make use of required.kmods

This greatly speeds up skipping a test that can't be run.

Sponsored by:   ConnectWise
Reviewed by:    kp
Differential Revision: https://reviews.freebsd.org/D53215

(cherry picked from commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99)
DeltaFile
+11-7tests/sys/netpfil/pf/sctp.sh
+11-71 files

HardenedBSD/src 465c30csys/dev/nvme nvme_ctrlr.c nvme_ns.c

nvme: add support for DIOCGIDENT

Add support for the DIOCGIDENT ioctl to both nvme controller device
nodes and namespace device nodes.

This information was already available via the nda(4) device node.
However, mapping /dev/nvmeX to /dev/ndaY device nodes is not
straightforward, so it's better to get it directly from the /dev/nvme
device node.

PR:             290259
Sponsored by:   ConnectWise
Submitted by:   imp (mostly)
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1875

(cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3)
DeltaFile
+24-0sys/dev/nvme/nvme_ctrlr.c
+5-0sys/dev/nvme/nvme_ns.c
+1-0sys/dev/nvme/nvme_private.h
+30-03 files

HardenedBSD/src dbf10fbtests/sys/netpfil/pf sctp.sh

tests/sys/netpfil/pf/sctp: make use of required.kmods

This greatly speeds up skipping a test that can't be run.

Sponsored by:   ConnectWise
Reviewed by:    kp
Differential Revision: https://reviews.freebsd.org/D53215

(cherry picked from commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99)
DeltaFile
+11-7tests/sys/netpfil/pf/sctp.sh
+11-71 files

HardenedBSD/src cd81f86usr.bin/find find.c

find: fix pathnames printed by the SIGINFO handler

Don't duplicate the last component.

PR:             290362
Reported by:    John F. Carr <jfc at mit.edu>
Fixes:          d06a00963b7
Reviewed by:    jilles, Goran Mekić <meka at tilda.center>
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1878

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

HardenedBSD/src f6688f9tests/sys/fs/fusefs bad_server.cc mockfs.cc

fusefs: Fix intermittency in the BadServer.ShortWrite test case

We were using the m_quit bit for two similar but distinct uses:

* To instruct the server to quit
* To cope with the kernel forcibly unmounting the fs

Fix the intermittent test failure by adding a separate bit,
m_expect_unmount, to handle cases like the latter.

Reported by:    Siva Mahadevan <me at svmhdvn.name>
Revied by:      Siva Mahadevan <me at svmhdvn.name>
Differential Revision: https://reviews.freebsd.org/D53357

(cherry picked from commit d86025c1d49c84c4dc8c3635c83c078ad56e5a53)
DeltaFile
+4-4tests/sys/fs/fusefs/bad_server.cc
+3-2tests/sys/fs/fusefs/mockfs.cc
+3-0tests/sys/fs/fusefs/mockfs.hh
+10-63 files