HardenedBSD/src 9ce9589sys/contrib/openzfs/module/unicode u8_textprep.c, sys/contrib/openzfs/module/zfs u8_textprep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+7,037-228sys/contrib/openzfs/module/zstd/lib/common/xxhash.h
+4,698-1,133sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+2,171-0sys/contrib/openzfs/module/zfs/u8_textprep.c
+0-2,171sys/contrib/openzfs/module/unicode/u8_textprep.c
+1,288-592sys/contrib/openzfs/module/zstd/lib/decompress/huf_decompress.c
+1,478-370sys/contrib/openzfs/module/zstd/lib/zstd.h
+16,672-4,494521 files not shown
+38,446-15,269527 files

HardenedBSD/src 71b5c2bsys/contrib/openzfs/module/unicode u8_textprep.c, sys/contrib/openzfs/module/zfs u8_textprep.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+7,037-228sys/contrib/openzfs/module/zstd/lib/common/xxhash.h
+4,698-1,133sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+2,171-0sys/contrib/openzfs/module/zfs/u8_textprep.c
+0-2,171sys/contrib/openzfs/module/unicode/u8_textprep.c
+1,288-592sys/contrib/openzfs/module/zstd/lib/decompress/huf_decompress.c
+1,478-370sys/contrib/openzfs/module/zstd/lib/zstd.h
+16,672-4,494521 files not shown
+38,446-15,269527 files

HardenedBSD/src d20bc0elib/libsys sigreturn.2, usr.sbin/virtual_oss/virtual_oss virtual_oss.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+14-20usr.sbin/virtual_oss/virtual_oss/virtual_oss.c
+16-8lib/libsys/sigreturn.2
+30-282 files

HardenedBSD/src 251907crelease/tools ec2.conf

EC2: Fix comment re avoiding unicode

We're avoiding *unicode*, not avoiding *ascii*.

Reported by:    marck
Fixes:  277830b4d3ae ("EC2: Don't use unicode in boot loader")
MFC after:      3 days
DeltaFile
+2-1release/tools/ec2.conf
+2-11 files

HardenedBSD/src 922d735sys/fs/tarfs tarfs_io.c

tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset()

ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0

This change is needed to MFV zstd 1.5.7.

Approved by:    emaste (mentor)
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55835
DeltaFile
+2-2sys/fs/tarfs/tarfs_io.c
+2-21 files

HardenedBSD/src 736d885tests/sys/fs/fusefs read.cc

tests/fusefs: fix sign-compare warning on armv7

Fixes:          7e68af7ce2c1b892954df415774fe59fd2f1b62f
Reviewed by:    asomers
Approved by:    emaste (mentor)
Differential Revision:  https://reviews.freebsd.org/D55846
DeltaFile
+5-5tests/sys/fs/fusefs/read.cc
+5-51 files

HardenedBSD/src 4efe7fashare/misc committers-ports.dot

committers-ports.dot: Add new committer (laurent)

Update Mentor (thierry) and Mentee (laurent) Information.

Reviewed by:    thierry (mentor)
Approved by:    thierry (mentor)
Differential Revision:  https://reviews.freebsd.org/D55856
DeltaFile
+3-1share/misc/committers-ports.dot
+3-11 files

HardenedBSD/src 9c49c39usr.sbin/virtual_oss/virtual_oss virtual_oss.c

virtual_oss: Use virtual_oss_timestamp() to avoid duplication

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit e75c8faf277dded0a80d469cb8182583716a2211)
DeltaFile
+13-16usr.sbin/virtual_oss/virtual_oss/virtual_oss.c
+13-161 files

HardenedBSD/src c4e303fusr.sbin/virtual_oss/virtual_oss virtual_oss.c

virtual_oss: Use virtual_oss_delay_ns() to avoid duplication

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 3a410851bf02c247e71bcd06fdeec2706c6b6070)
DeltaFile
+1-4usr.sbin/virtual_oss/virtual_oss/virtual_oss.c
+1-41 files

HardenedBSD/src 8a62a2asys/contrib/openzfs/module/unicode u8_textprep.c, sys/contrib/openzfs/module/zfs u8_textprep.c

zfs: merge openzfs/zfs at f8e5af53e

Notable upstream pull request merges:
 #17358 4975430cf Add vdev property to disable vdev scheduler
 #18031 c77f17b75 Add snapshots_changed_nsecs dataset property
 #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly created
                  datasets
 #18089 -multiple Zstd: Update bundled library to version 1.5.7
 #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the
                  snapshot
 #18093 -multiple L2ARC: Rework write throttling with DWPD rate limiting
                  and parallel writes
 #18095 2dbd6af5e Rename several printf attributes declarations to
                  __printf__
 #18096 8605bdfdd FreeBSD: unbreak compilation on i386
 #18105 794f1587d When receiving a stream with the large block flag,
                  activate feature
 #18115 765929cb4 DDT: Add locking for table ZAP destruction
 #18118 09e4e01e9 Fix history logging for `zpool create -t`

    [45 lines not shown]
DeltaFile
+7,037-228sys/contrib/openzfs/module/zstd/lib/common/xxhash.h
+4,698-1,133sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+0-2,171sys/contrib/openzfs/module/unicode/u8_textprep.c
+2,171-0sys/contrib/openzfs/module/zfs/u8_textprep.c
+1,288-592sys/contrib/openzfs/module/zstd/lib/decompress/huf_decompress.c
+1,478-370sys/contrib/openzfs/module/zstd/lib/zstd.h
+16,672-4,494517 files not shown
+38,434-15,260523 files

HardenedBSD/src fa87979sys/dev/acpi_support acpi_system76.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+11-10sys/dev/acpi_support/acpi_system76.c
+11-101 files

HardenedBSD/src 115f719sys/dev/acpi_support acpi_system76.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+11-10sys/dev/acpi_support/acpi_system76.c
+11-101 files

HardenedBSD/src 7df7171lib/libc/riscv/string Makefile.inc, tools/build depend-cleanup.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+4-1tools/build/depend-cleanup.sh
+0-1lib/libc/riscv/string/Makefile.inc
+4-22 files

HardenedBSD/src 7566892lib/libsys sigreturn.2

sigreturn.2: refresh the man page

(cherry picked from commit 9da4a804f0916b24519b8baa7ed460a7ba23d8c8)
DeltaFile
+16-8lib/libsys/sigreturn.2
+16-81 files

HardenedBSD/src f914641sys/dev/acpi_support acpi_system76.c

acpi_system76: Improve sysctl names

* Improve sysctl descriptions.
* Rename battery charging-threshold sysctl for clarity.
* Fix mis-spelled words.
* Style: sort headers.

Reported by: olce, jhb
Reviewed by: olce
Differential Revision: https://reviews.freebsd.org/D55848
DeltaFile
+11-10sys/dev/acpi_support/acpi_system76.c
+11-101 files

HardenedBSD/src 521519ftools/build depend-cleanup.sh

depend-cleanup.sh: rebuild strnlen.o on riscv64 if it came from strnlen.S

We have to switch back to the previous rule once the temporary
build fix has been replaced with a permanent fix.

MFC after:      1 week
See also:       2a4e3112c811b9892e14e15cfd23538e7e47329c
PR:             293353, 293296

(cherry picked from commit b5514e1c6d9e7ec09b299a983d1ce32852e0d9dc)
DeltaFile
+4-1tools/build/depend-cleanup.sh
+4-11 files

HardenedBSD/src 0536513lib/libc/riscv/string Makefile.inc

libc/riscv64: temporarily disable strnlen() implementation until a fix is developed

strnlen() doesn't seem to cope well with a length argument such that
string pointer plus length overflows past the end of the address space.

Reviewed by:    fuz
MFC after:      1 week
PR:             293353, 293296
Differential Revision:  https://reviews.freebsd.org/D55714

(cherry picked from commit 2a4e3112c811b9892e14e15cfd23538e7e47329c)
DeltaFile
+0-1lib/libc/riscv/string/Makefile.inc
+0-11 files

HardenedBSD/src 8724e17lib/libc/stdlib cxa_thread_atexit_impl.c, sys/kern kern_time.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+3-3sys/netinet/in_pcb.h
+2-2lib/libc/stdlib/cxa_thread_atexit_impl.c
+3-1sys/kern/kern_time.c
+2-1sys/netinet/tcp_stacks/sack_filter.c
+10-74 files

HardenedBSD/src a17be34lib/libc/stdlib cxa_thread_atexit_impl.c, sys/kern kern_time.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+3-3sys/netinet/in_pcb.h
+3-1sys/kern/kern_time.c
+2-2lib/libc/stdlib/cxa_thread_atexit_impl.c
+2-1sys/netinet/tcp_stacks/sack_filter.c
+10-74 files

HardenedBSD/src 9d26b82lib/libc/stdlib cxa_thread_atexit_impl.c

libc: Fix dtor order in __cxa_thread_atexit

The thread_local variable may creates another thread_local variable
inside its dtor. This new object is immediately be registered in
__cxa_thread_atexit() and need to be freed before processing another
variable.

This fixes the libcxx test thread_local_destruction_order.pass.cpp.

Reported by:    kib
Approved by:    lwhsu (mentor)
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55826
DeltaFile
+2-2lib/libc/stdlib/cxa_thread_atexit_impl.c
+2-21 files

HardenedBSD/src 728ae49sys/kern kern_time.c

kern_time: Honor the precise option when counting diff

When preecise option is used, the true elapsed time should also use the
precise timer.

This fixes the test case sleep_for.signals.pass.cpp in libcxx.

Reviewed by:    kib, imp
Approved by:    lwhsu (mentor)
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55824
DeltaFile
+3-1sys/kern/kern_time.c
+3-11 files

HardenedBSD/src 4f59a7esys/netinet/tcp_stacks sack_filter.c

tcp: fix up !VIMAGE builds

The tcp_seq.h uses getmicrouptime() in an inline function, but it doesn't
include <sys/time.h>.  This was usually masked by having tcp_var.h always
before tcp_seq.h, so restore that.

Fixes:  c0462c2deafdcfe885e8d6f91b529d8cbddc6014
DeltaFile
+2-1sys/netinet/tcp_stacks/sack_filter.c
+2-11 files

HardenedBSD/src a47c870sys/netinet in_pcb.h

inpcb: fix up !VIMAGE builds

There are some files that don't include mutex.h and rwlock.h, but use
inpcb locking macros.  With VIMAGE the net/vnet.h pulls half of the
possible kernel includes, masking the problem.  The in_pcb.h also used to
mask the problem, so restore that.

Fixes:  041e9eb1ae094a81e55fbcaba37eb2ac194658cc
DeltaFile
+3-3sys/netinet/in_pcb.h
+3-31 files

HardenedBSD/src 4e9c1bcsys/contrib/zlib gzread.c zlib.h, sys/contrib/zlib/contrib/gcc_gvmat64 gvmat64.S

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-574sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+190-124sys/contrib/zlib/gzread.c
+213-94sys/contrib/zlib/zlib.h
+168-99sys/contrib/zlib/gzwrite.c
+38-151sys/contrib/zlib/inflate.c
+91-91sys/contrib/zlib/inffixed.h
+700-1,13342 files not shown
+1,704-1,81048 files

HardenedBSD/src b795742sys/contrib/zlib gzread.c zlib.h, sys/contrib/zlib/contrib/gcc_gvmat64 gvmat64.S

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-574sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+190-124sys/contrib/zlib/gzread.c
+213-94sys/contrib/zlib/zlib.h
+168-99sys/contrib/zlib/gzwrite.c
+38-151sys/contrib/zlib/inflate.c
+91-91sys/contrib/zlib/inffixed.h
+700-1,13342 files not shown
+1,704-1,81048 files

HardenedBSD/src 7aa1dbasys/contrib/zlib gzread.c zlib.h, sys/contrib/zlib/contrib/gcc_gvmat64 gvmat64.S

MFV: zlib 1.3.2.

Relnotes:       yes
MFC after:      2 weeks
DeltaFile
+0-574sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+190-124sys/contrib/zlib/gzread.c
+213-94sys/contrib/zlib/zlib.h
+168-99sys/contrib/zlib/gzwrite.c
+38-151sys/contrib/zlib/inflate.c
+91-91sys/contrib/zlib/inffixed.h
+700-1,13331 files not shown
+1,622-1,75137 files

HardenedBSD/src 280d433contrib/gcc_gvmat64 gvmat64.S, contrib/vstudio/vc14 zlibvc.vcxproj

Vendor import of zlib 1.3.2.
DeltaFile
+570-574contrib/gcc_gvmat64/gvmat64.S
+0-1,100contrib/vstudio/vc9/zlibvc.vcproj
+0-875contrib/vstudio/vc17/zlibvc.vcxproj
+0-796contrib/vstudio/vc9/testzlib.vcproj
+0-781contrib/vstudio/vc9/zlibstat.vcproj
+0-668contrib/vstudio/vc14/zlibvc.vcxproj
+570-4,794244 files not shown
+10,397-25,093250 files

HardenedBSD/src eb0a78fsys/x86/include specialreg.h, sys/x86/x86 identcpu.c

x86 FRED: add CPUID, MSR, and CR4 bits

Reviewed by:    jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55810
DeltaFile
+23-0sys/x86/include/specialreg.h
+7-4sys/x86/x86/identcpu.c
+30-42 files

HardenedBSD/src 914a535sys/amd64/amd64 trap.c

amd64: move efirt trap checks into the helper

Reviewed by:    imp, jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55808
DeltaFile
+26-29sys/amd64/amd64/trap.c
+26-291 files

HardenedBSD/src d92ebdesys/amd64/amd64 trap.c

amd64: move code to clear PSL_T on debug exception into a helper

Reviewed by:    jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55827
DeltaFile
+13-8sys/amd64/amd64/trap.c
+13-81 files