HardenedBSD/src a0d9642bin/ed io.c ed.h, bin/ed/tests ed_test.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+333-0bin/ed/tests/ed_test.sh
+53-19bin/ed/io.c
+2-0bin/ed/ed.h
+1-1usr.bin/diff3/diff3.c
+389-204 files

HardenedBSD/src f33770bbin/ed io.c ed.h, bin/ed/tests ed_test.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+333-0bin/ed/tests/ed_test.sh
+53-19bin/ed/io.c
+1-1usr.bin/diff3/diff3.c
+2-0bin/ed/ed.h
+389-204 files

HardenedBSD/src 5ddfd1dusr.bin/diff3 diff3.c

diff3: bump version to the date when the GNU diff3 compat was reached
DeltaFile
+1-1usr.bin/diff3/diff3.c
+1-11 files

HardenedBSD/src 5df6acabin/ed io.c ed.h

ed: add unicode support for the l (list) command

Use mbrtowc()/iswprint()/wcwidth() in put_tty_line() so that
the l command displays valid multibyte characters as-is instead
of escaping each byte as octal.

Column wrapping now correctly accounts for character display
width (including double-width CJK characters).

Invalid or incomplete UTF-8 sequences and non-printable
characters are still escaped as octal.

Differential Revision:  https://reviews.freebsd.org/D55365
DeltaFile
+53-19bin/ed/io.c
+2-0bin/ed/ed.h
+55-192 files

HardenedBSD/src 7c2c2c2bin/ed/tests ed_test.sh

ed: add unicode test cases to ATF test suite

Including examples in Cyrillic suggested by kib@

Differential Revusion:  https://reviews.freebsd.org/D55364
DeltaFile
+333-0bin/ed/tests/ed_test.sh
+333-01 files

HardenedBSD/src b7a8e9asys/amd64/amd64 initcpu.c, usr.sbin/bhyveload bhyveload.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+12-14usr.sbin/bhyveload/bhyveload.c
+1-1sys/amd64/amd64/initcpu.c
+13-152 files

HardenedBSD/src 79ecf4csys/amd64/amd64 initcpu.c, usr.sbin/bhyveload bhyveload.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+12-14usr.sbin/bhyveload/bhyveload.c
+1-1sys/amd64/amd64/initcpu.c
+13-152 files

HardenedBSD/src 6da9d46usr.sbin/bhyveload bhyveload.c

bhyveload: simplify cb_open() and eliminate minor TOCTOU

It's not at all clear why I wrote it like this, but we can do better.

I wouldn't think this really has any meaningful security implications
since the hierarchy in question can't really be modified by the guest
scripts, but it would seem to make it a little more robust.

Fixes:  6779d44bd878e3c ("bhyveload: use a dirfd to support -h")
Reviewed by:    bnovkov, markj
Differential Revision:  https://reviews.freebsd.org/D55379
DeltaFile
+12-14usr.sbin/bhyveload/bhyveload.c
+12-141 files

HardenedBSD/src 6099b46sys/amd64/amd64 initcpu.c

amd64 initializecpu(): use 64bit type for rcr4() result

Right now %cr4 defined bits fit into the low word, but this is not true
with FRED.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+1-1sys/amd64/amd64/initcpu.c
+1-11 files

HardenedBSD/src 339ea07lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json, sys/dev/hwpmc hwpmc_ibs.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+3,100-039 files not shown
+4,600-12345 files

HardenedBSD/src 77d7b42lib/libiscsiutil Makefile, libexec/nuageinit nuageinit.7

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+19-29usr.bin/diff3/diff3.c
+2-3libexec/nuageinit/nuageinit.7
+1-1usr.sbin/ctld/Makefile
+1-1lib/libiscsiutil/Makefile
+1-1usr.sbin/iscsid/Makefile
+1-0share/mk/src.libnames.mk
+25-356 files

HardenedBSD/src 5e23acbsys/dev/sound/pcm channel.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+15-1sys/dev/sound/pcm/channel.c
+15-11 files

HardenedBSD/src 7456bdcrelease/tools vmimage.subr, usr.sbin/bsdinstall/scripts mirrorselect

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-49usr.sbin/bsdinstall/scripts/mirrorselect
+4-20release/tools/vmimage.subr
+4-692 files

HardenedBSD/src b9b7ad3lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json, sys/dev/hwpmc hwpmc_ibs.c

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

Conflicts:
        release/tools/vmimage.subr (unresolved)
        usr.sbin/bsdinstall/scripts/mirrorselect (unresolved)
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+3,100-034 files not shown
+4,631-7940 files

HardenedBSD/src c2dee77usr.bin/diff3 diff3.c

diff3: Code cleanup

* Order includes.

* Turn the diff type into an enum.

* Turn an unreachable error message into an assertion.

* Remove unused debugging code.

* Remove some dead assignments.

* Consistently use 1 instead of EXIT_FAILURE.

* Turn a return from main() into an exit().

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    bapt
Differential Revision:  https://reviews.freebsd.org/D55517
DeltaFile
+19-29usr.bin/diff3/diff3.c
+19-291 files

HardenedBSD/src 05ca483lib/libiscsiutil Makefile, share/mk src.libnames.mk

libiscsiutil: Record dependency on libmd

MFC after:      3 days
Fixes:          6378393308bc ("Add an internal libiscsiutil library.")
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D55596
DeltaFile
+1-1usr.sbin/ctld/Makefile
+1-1lib/libiscsiutil/Makefile
+1-1usr.sbin/iscsid/Makefile
+1-0share/mk/src.libnames.mk
+4-34 files

HardenedBSD/src df5014flibexec/nuageinit nuageinit.7

nuageinit.7: Fix a couple of minor errors

Use the correct key name in the chpasswd section.
Remove a stray line to fix the description of 'password'.

MFC after:      1 week
Sponsored by:   Chelsio Communications
Reviewed by:    maxim
Differential Revision:  https://reviews.freebsd.org/D55547
DeltaFile
+2-3libexec/nuageinit/nuageinit.7
+2-31 files

HardenedBSD/src a9f454asys/dev/sound/pcm channel.c

sound: Detect unsupported formats

This way we can avoid edge-cases like
8af6aee96ed609456900c6dd92dafabac5e89c0a ("virtual_oss(8): Remove
floating point formats from preference list").

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

(cherry picked from commit 3deae7b786743193531f4e69527e789de52644c5)
DeltaFile
+15-1sys/dev/sound/pcm/channel.c
+15-11 files

HardenedBSD/src 32beb3asys/net vnet.c

vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned

Some 32-bit architectures, e.g., armv7, require strict 8-byte
alignment while doing atomic 64-bit access. Hence aligning to the
pointer type (4-byte alignment) does not meet the requirement on
those architectures.

Make the space allocated by vnet_data_alloc() sufficent aligned to
avoid unaligned access.

PR:             265639
Diagnosed by:   markj
Reviewed by:    jhb, markj
Co-authored-by: jhb
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D55560
DeltaFile
+11-3sys/net/vnet.c
+11-31 files

HardenedBSD/src d44d79eusr.sbin/bsdinstall/scripts mirrorselect

bsdinstall: remove ftp.at.freebsd.org

After ~13 years of running the ftp.at.freebsd.org community mirror is
shutting down at the end of March.  Remove it from the mirrorselect
script.

Reported by:    Klaus P. Ohrhallinger <k at 7he.at>
DeltaFile
+0-1usr.sbin/bsdinstall/scripts/mirrorselect
+0-11 files

HardenedBSD/src 5a59ef8sys/dev/iommu iommu_gas.c, sys/kern kern_procctl.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+64-85sys/kern/kern_procctl.c
+1-1sys/dev/iommu/iommu_gas.c
+65-862 files

HardenedBSD/src fe90ad2sys/kern kern_procctl.c

procctl(PROC_REAP_KILL): align error reporting with pgkill(2)

(cherry picked from commit 5c8af592f69a31da94c45722dcd74afcf0ab375e)
DeltaFile
+5-1sys/kern/kern_procctl.c
+5-11 files

HardenedBSD/src cf64824sys/kern kern_procctl.c

reap_kill_subtree_once(): reap_kill_proc_work() might drop proctree_lock

(cherry picked from commit 0e67c3f675eab3a9c00b76e3886ace7700ef1bd4)
DeltaFile
+8-3sys/kern/kern_procctl.c
+8-31 files

HardenedBSD/src 08f95c4sys/kern kern_procctl.c

procctl(PROC_REAP_KILL): use pgrp pg_killsx sx to sync with fork

PR:     290844

(cherry picked from commit be140717a0a4bbfa7176d334c36364d34a0b1bc5)
DeltaFile
+54-84sys/kern/kern_procctl.c
+54-841 files

HardenedBSD/src e0dbeabsys/dev/iommu iommu_gas.c

iommu_gas: Fix assertion.

(cherry picked from commit 7e8284c6ad95bb7a0fc84d4d945ee98737efdd36)
DeltaFile
+1-1sys/dev/iommu/iommu_gas.c
+1-11 files

HardenedBSD/src 565a233sys/dev/e1000 if_em.c, usr.sbin/freebsd-update freebsd-update.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+4-0usr.sbin/freebsd-update/freebsd-update.sh
+2-2sys/dev/e1000/if_em.c
+6-22 files

HardenedBSD/src b24dc84sys/dev/e1000 if_em.c

e1000: Increase FC pause/refresh time on PCH2 and newer

This corresponds to Linux f74dc880098b4a29f76d756b888fb31d81ad9a0c

That commit does not provide any public background detail, but it's been
in use for over 5 years and corresponds to previous chip bugs w.r.t.
automatic generation of PAUSE frames.

Reviewed by:    kgalazka
Differential Revision:  https://reviews.freebsd.org/D54555

(cherry picked from commit 2bdec2ee73be7dbafce9982b0dc5c273918a5443)
DeltaFile
+2-2sys/dev/e1000/if_em.c
+2-21 files

HardenedBSD/src 178d0b5lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json

libpmc: Import AMD Zen 6 PMU events.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2049
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+177-0lib/libpmc/pmu-events/arch/x86/amdzen6/l3-cache.json
+2,663-06 files not shown
+3,217-112 files

HardenedBSD/src 3ce3e89lib/libpmc/pmu-events/arch/x86/amdzen1 recommended.json, lib/libpmc/pmu-events/arch/x86/amdzen2 recommended.json

libpmc: Update event definitions for AMD Zen

The pmu event definitions for AMD Zen 5 was updated since it was
imported into the tree.  As a bonus I also updated the recommended json
counters for Zen 1-3 even though we do not use that file yet.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2048
DeltaFile
+3-3lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json
+9-64 files

HardenedBSD/src e51ef8alib/libpmc libpmc.c, sys/dev/hwpmc hwpmc_ibs.c hwpmc_ibs.h

hwpmc: Initial support for AMD IBS

This patch adds support for AMD IBS.  It adds a new class of performance
counter that cotains two events: ibs-fetch and ibs-op events. Unlike
most existing sampled events, IBS events provide a number of values
containing extra information regarding the sample.  To support this we
use the existing callchain event, and introduce a new flag for multipart
payloads.  The first 8 bytes of the pc_sample contains a header that
defines up to four payloads.

Sponsored by: Netflix

Reviewed by: imp,mhorne
Pull Request: https://github.com/freebsd/freebsd-src/pull/2022
DeltaFile
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+176-0sys/dev/hwpmc/hwpmc_ibs.h
+98-1usr.sbin/pmcstat/pmcstat_log.c
+84-12sys/dev/hwpmc/hwpmc_mod.c
+57-7lib/libpmc/libpmc.c
+23-4sys/x86/x86/local_apic.c
+1,052-248 files not shown
+1,130-3214 files