HardenedBSD/src 0a4747ctests/sys/common vnet.subr

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1tests/sys/common/vnet.subr
+1-11 files

HardenedBSD/src 23af364tests/sys/common vnet.subr

tests: detect built-in modules

When checking vnet test prerequisites we check if if_epair and if_bridge are
available, but we only checked for loadable modules. It's possible for these to
be built into the kernel instead.

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+1-1tests/sys/common/vnet.subr
+1-11 files

HardenedBSD/src 925ee1dlib/libc/stdlib strfmon.c, sys/dev/nvme nvme.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1sys/dev/nvme/nvme.h
+1-1lib/libc/stdlib/strfmon.c
+2-22 files

HardenedBSD/src cf26a98contrib/llvm-project/clang/lib/Driver/ToolChains FreeBSD.h, lib/clang freebsd_cc_version.h

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+5-0contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
+1-1lib/clang/freebsd_cc_version.h
+2-0lib/libgcc_s/Makefile
+8-13 files

HardenedBSD/src 6ab30d0contrib/llvm-project/clang/lib/Driver/ToolChains FreeBSD.h, lib/clang freebsd_cc_version.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+5-0contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
+1-1lib/clang/freebsd_cc_version.h
+2-0lib/libgcc_s/Makefile
+8-13 files

HardenedBSD/src e4e5e7dcontrib/llvm-project/clang/lib/Driver/ToolChains FreeBSD.h, lib/clang freebsd_cc_version.h

Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):"

    [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089)

The compiler_rt helper functions have been built since 12.4, 13.1, 14
and anything newer.

This reverts commit bd27bd1f51d049538cc7a0053be9d99110a53ae1.

Only some people (including the release manager, unfortunately) ran into
build issues with the previous iteration of this commit, because they
were bootstrapping the compiler, either via the WITHOUT_SYSTEM_COMPILER
src.conf(5) setting, or because the build system determined that their
base system compiler was out of date.

The bootstrapped compiler would then enable outline atomics and compile
libgcc_s with these, but because libgcc_s is linked with -nodefaultlibs,
it could not find the helper routines in libcompiler_rt.a.


    [17 lines not shown]
DeltaFile
+5-0contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
+1-1lib/clang/freebsd_cc_version.h
+2-0lib/libgcc_s/Makefile
+8-13 files

HardenedBSD/src a48358dcontrib/llvm-project/clang/lib/Driver/ToolChains FreeBSD.h, lib/clang freebsd_cc_version.h

Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):"

    [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089)

The compiler_rt helper functions have been built since 12.4, 13.1, 14
and anything newer.

This reverts commit bd27bd1f51d049538cc7a0053be9d99110a53ae1.

Only some people (including the release manager, unfortunately) ran into
build issues with the previous iteration of this commit, because they
were bootstrapping the compiler, either via the WITHOUT_SYSTEM_COMPILER
src.conf(5) setting, or because the build system determined that their
base system compiler was out of date.

The bootstrapped compiler would then enable outline atomics and compile
libgcc_s with these, but because libgcc_s is linked with -nodefaultlibs,
it could not find the helper routines in libcompiler_rt.a.


    [17 lines not shown]
DeltaFile
+5-0contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
+1-1lib/clang/freebsd_cc_version.h
+2-0lib/libgcc_s/Makefile
+8-13 files

HardenedBSD/src 718acd7sys/dev/nvme nvme.h

nvme: Use 'unsigned int' in preference to bare unsigned

It's our preferred style. No functional change.

Noticed by: avg
Sponsored by: Netflix
DeltaFile
+1-1sys/dev/nvme/nvme.h
+1-11 files

HardenedBSD/src 91e7f19lib/libc/stdlib strfmon.c

strfmon: Fix typo s/poistion/position/

MFC after:      1 week
DeltaFile
+1-1lib/libc/stdlib/strfmon.c
+1-11 files

HardenedBSD/src 489d73esys/cam/nvme nvme_da.c, sys/dev/cxgbe t4_main.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+18-3sys/dev/cxgbe/t4_main.c
+4-5sys/cam/nvme/nvme_da.c
+2-2sys/net/if.h
+1-0sys/modules/agp/Makefile
+25-104 files

HardenedBSD/src bd2919elib/libc/stdlib/malloc/jemalloc jemalloc.3, sys/cam/nvme nvme_da.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+179-21lib/libc/stdlib/malloc/jemalloc/jemalloc.3
+4-5sys/cam/nvme/nvme_da.c
+183-262 files

HardenedBSD/src e271f93sys/cam/nvme nvme_da.c

nda: fix setting of unmappedio flag

The upstream refactoring of ndaregister() to split out ndasetgeom()
accidentally used an uninitialed variable to decide whether or not
to set DISKFLAG_UNMAPPED_BIO.  Fix this by moving that portion of
ndasetgeom() back up to ndaregister().  The check for PIM_UNMAPPED
is not really needed because nvme devices always have that set,
so it cannot change in the other path that ndasetgeom() is now called.

Reviewed by:    imp
Fixes:          dffd882d12d2a71aca464f48209ec9ae6f393b15
Sponsored by:   Netflix
MFC After:      1 minute
(cherry picked from commit 2b4dbad2db5766294ee97bb96228ec6826a9e7c3)
DeltaFile
+4-5sys/cam/nvme/nvme_da.c
+4-51 files

HardenedBSD/src 2b4dbadsys/cam/nvme nvme_da.c

nda: fix setting of unmappedio flag

The upstream refactoring of ndaregister() to split out ndasetgeom()
accidentally used an uninitialed variable to decide whether or not
to set DISKFLAG_UNMAPPED_BIO.  Fix this by moving that portion of
ndasetgeom() back up to ndaregister().  The check for PIM_UNMAPPED
is not really needed because nvme devices always have that set,
so it cannot change in the other path that ndasetgeom() is now called.

Reviewed by:    imp
Fixes:          dffd882d12d2a71aca464f48209ec9ae6f393b15
Sponsored by:   Netflix
MFC After:      1 minute
DeltaFile
+4-5sys/cam/nvme/nvme_da.c
+4-51 files

HardenedBSD/src 98f6f6esys/dev/cxgbe t4_main.c

cxgbe(4): Enable IFCAP_NV and implement SIOCGIFCAPNV/SIOCSIFCAPNV

MFC after:      1 week
Sponsored by:   Chelsio Communications
DeltaFile
+18-3sys/dev/cxgbe/t4_main.c
+18-31 files

HardenedBSD/src cbe0ccdlib/libc/stdlib/malloc/jemalloc jemalloc.3

jemalloc: apply freebsd changes to jemalloc 5.3.0 man page

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1890

(cherry picked from commit 80ec82aba9ae7286cac1a4f8000262cf2cf34d0c)
DeltaFile
+31-1lib/libc/stdlib/malloc/jemalloc/jemalloc.3
+31-11 files

HardenedBSD/src 6162f86lib/libc/stdlib/malloc/jemalloc jemalloc.3

jemalloc: import jemalloc 5.3.0 man page

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1890

(cherry picked from commit bf4c7487f25d3891425a9ba54516b740a948876b)
DeltaFile
+180-52lib/libc/stdlib/malloc/jemalloc/jemalloc.3
+180-521 files

HardenedBSD/src a87c1e2sys/modules/agp Makefile

agp: Export intel_gtt_read_pte, required by i915kms

This isn't used by modern cards, but is needed for i915kms to load
on a system that has agp as a module not compiled into the kernel.

PR:             291214
Reviewed by:    cy
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53906
DeltaFile
+1-0sys/modules/agp/Makefile
+1-01 files

HardenedBSD/src 0dd7706lib/libc/stdlib/malloc/jemalloc jemalloc.3, lib/libefivar uefi-dputil.c efivar-dp-xlate.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+412-125lib/libefivar/uefi-dputil.c
+179-21lib/libc/stdlib/malloc/jemalloc/jemalloc.3
+67-0tests/sys/netpfil/pf/sctp.py
+4-7sys/dev/nvme/nvme.h
+5-5lib/libefivar/efivar-dp-xlate.c
+6-1libexec/rtld-elf/rtld.1
+673-15912 files not shown
+690-17218 files

HardenedBSD/src a49ee72sys/kern kern_event.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+12-4sys/kern/kern_event.c
+12-41 files

HardenedBSD/src 9af9f5fsys/kern kern_event.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+12-4sys/kern/kern_event.c
+12-41 files

HardenedBSD/src 136a80asys/net if.h

if.h: Fix a couple of typos in comments

No functional change.
DeltaFile
+2-2sys/net/if.h
+2-21 files

HardenedBSD/src b1b0fb3sys/riscv/conf GENERIC

fib_algo: add FIB_ALGO to GENERIC kernel config on riscv

FIB_ALGO modular FIB lookups have been enabled by default on
amd64 and arm64 since 2021, so enable it on riscv as well.

Reviewed by:    melifaro
MFC after:      1 month
DeltaFile
+1-0sys/riscv/conf/GENERIC
+1-01 files

HardenedBSD/src 80ec82alib/libc/stdlib/malloc/jemalloc jemalloc.3

jemalloc: apply freebsd changes to jemalloc 5.3.0 man page

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1890
DeltaFile
+31-1lib/libc/stdlib/malloc/jemalloc/jemalloc.3
+31-11 files

HardenedBSD/src bf4c748lib/libc/stdlib/malloc/jemalloc jemalloc.3

jemalloc: import jemalloc 5.3.0 man page

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1890
DeltaFile
+180-52lib/libc/stdlib/malloc/jemalloc/jemalloc.3
+180-521 files

HardenedBSD/src 51f278elib/libsys lseek.2

lseek.2: SEEK_HOLE, SEEK_DATA & ENXIO conform to POSIX 2024

Signed-off-by: Ricardo Branco <rbranco at suse.de>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1891
DeltaFile
+2-1lib/libsys/lseek.2
+2-11 files

HardenedBSD/src 4c8bf76usr.sbin/fdread fdread.c

fdread: Fix logic bug when reading by sector

When reading by sector (because reading a whole track failed), we can
accidentally fall into the "should not happen" path, which both
(a) emits a spurious error message and (b) fouls up our position
accounting going forward.  Ensure we do not inappropriately fall into
that path.

Avoid obscuring the "short after" message in cases where it happens.

Signed-off-by: Matt Jacobson <mhjacobson at me.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1897
DeltaFile
+2-1usr.sbin/fdread/fdread.c
+2-11 files

HardenedBSD/src f7725c3sys/conf NOTES

NOTES: Fix a typo in a comments

Signed-off-by: ykla yklaxds at gmail.com
Sponsored by:   Chinese FreeBSD Community
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1899
DeltaFile
+1-1sys/conf/NOTES
+1-11 files

HardenedBSD/src 6fa0057lib/libefivar uefi-dputil.c

libefivar: Support UefiDevicePathLib under StandaloneMm

This change added an instance of UefiDevicePathLib for StandaloneMm. It
abstracts DevicePathFromHandle function into different files for
Standalone MM and other instances to avoid linking gBS into MM_STANDALONE
drivers.

No functional change intended, as this function and its invocation are ifdefd
out.

Obtained from:  https://github.com/tianocore/edk2/commit/14a746bb6a92d59669c67a970479558734cf2383

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1894
DeltaFile
+0-33lib/libefivar/uefi-dputil.c
+0-331 files

HardenedBSD/src ca6fef2lib/libefivar uefi-dputil.c

libefivar: Change OPTIONAL keyword usage style

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3760

Update all use of ', OPTIONAL' to ' OPTIONAL,' for function params.

Note that the link above no longer exists.  The commit message was kept
verbatim.  An archive of the bug report can be found at:
https://web.archive.org/web/20240714185609/https://bugzilla.tianocore.org/show_bug.cgi?id=3760

Obtained from:  https://github.com/tianocore/edk2/commit/d0e2f8232a26453fc0191629ed44ff2a46ea073e

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1894
DeltaFile
+5-5lib/libefivar/uefi-dputil.c
+5-51 files

HardenedBSD/src a4e3e72sys/amd64/conf NOTES

NOTES: Remove duplicate options KCSAN entries

Signed-off-by: ykla yklaxds at gmail.com
Sponsored by: Chinese FreeBSD Community
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1900
DeltaFile
+0-1sys/amd64/conf/NOTES
+0-11 files