HardenedBSD/src be35d1eusr.bin Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-8usr.bin/Makefile
+0-81 files

HardenedBSD/src 8da4910sys/dev/iwx if_iwx.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-3sys/dev/iwx/if_iwx.c
+3-31 files

HardenedBSD/src 114976ashare/man/man9 style.9, sys/dev/iwx if_iwx.c

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

Conflicts:
        usr.bin/Makefile (unresolved)
DeltaFile
+30-22share/man/man9/style.9
+43-7sys/kern/uipc_socket.c
+37-7sys/dev/nvme/nvme_pci.c
+9-0usr.bin/Makefile
+3-3sys/dev/iwx/if_iwx.c
+2-0usr.bin/clang/llvm-cxxfilt/Makefile
+124-396 files

HardenedBSD/src b3d9e50sys/dev/nvme nvme_pci.c

nvme: Don't active memory space until all BARs are configured

In the current current behavior the 2nd and 3rd BARs can be activated
when they're configured with address zero. This change defers the
activation of all BARs until after they've all been configured with an
address.

This enables FreeBSD on Google Compute Engine C4-LSSD Machines.

Sponsored by:           Google
Tested by:              NetApp (previous version)
Reviewed by:            gallatin, imp
Discussed with:         jrtc27 (improved error reporting)
Differential Revision:  https://reviews.freebsd.org/D55541
DeltaFile
+37-7sys/dev/nvme/nvme_pci.c
+37-71 files

HardenedBSD/src 815fdbdsys/dev/iwx if_iwx.c

iwx: Re-activate the 32-bit boundary cross check on 64-bit architectures

__SIZEOF_*__ is in bytes, not in bits...

Reported by:    brooks
Fixes:          35da55c28dbb ("iwx: Fix 32-bit compilation")
MFC after:      1 minute
MFC to:         stable/15
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit c1567d49a8320fd23dff9dbce1186f2331538253)
DeltaFile
+3-3sys/dev/iwx/if_iwx.c
+3-31 files

HardenedBSD/src af2c7d9share/man/man9 style.9

style.9: Encourage style changes when doing significant modifications

The rule of allowing style changes when about half or more of a file (or
group of files), coupled with the advice of avoiding stylistic changes,
could be interpreted as forbidding most style changes, even in heavily
modified functions.

In order to rule out that interpretation and ease transition towards our
prescribed style:
1. Clarify that avoiding stylistic changes concerns only "standalone"
   ones.
2. Actually encourage changing the style, and extend the cases where it
   is explicitly allowed to do so to any single logical unit as little
   as a function, keeping the existing "about half" of modified code as
   a rule of thumb.

When point 2 above applies, encourage to commit pure style changes
separately, and to add style-only commits to '.git-blame-ignore-revs'.


    [15 lines not shown]
DeltaFile
+30-22share/man/man9/style.9
+30-221 files

HardenedBSD/src c1567d4sys/dev/iwx if_iwx.c

iwx: Re-activate the 32-bit boundary cross check on 64-bit architectures

__SIZEOF_*__ is in bytes, not in bits...

Reported by:    brooks
Fixes:          35da55c28dbb ("iwx: Fix 32-bit compilation")
MFC after:      1 minute
MFC to:         stable/15
Sponsored by:   The FreeBSD Foundation
DeltaFile
+3-3sys/dev/iwx/if_iwx.c
+3-31 files

HardenedBSD/src 88dedd1usr.bin/clang/llvm-cxxfilt Makefile

llvm-cxxfilt: Install as c++filt only with LLVM_BINUTILS

When building WITHOUT_LLVM_BINUTILS /usr/bin/c++filt is the one from
ELF Tool Chain.

PR: 293610
Fixes: 5d757312ad59 ("build: Retire LLVM_CXXFILT option")
Sponsored by: The FreeBSD Foundation
DeltaFile
+2-0usr.bin/clang/llvm-cxxfilt/Makefile
+2-01 files

HardenedBSD/src f1e8b1asys/kern uipc_socket.c

splice: optionally limit worker queues

Add a new tunable/sysctl (kern.ipc.splice.num_wq) which can be used
to limit the number of splice worker queues as a way to limit
splice cpu use.

The default (-1) keeps the current behavior of running one worker
for each core in the system.  An administrator can set it to 0 (either
via tunable, or before the first splice call via sysctl) to
effectively disable splice, or some number smaller than the number of
cores to limit splice thread use.

Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D55579
Sponsored by: Netflix
DeltaFile
+43-7sys/kern/uipc_socket.c
+43-71 files

HardenedBSD/src 42e4df8usr.bin Makefile

usr.bin: Exclude ELF Tool Chain cxxfilt build

when LLVM_BINUTILS is enabled (which is the default).

PR: 293610
Fixes: 5d757312ad59 ("build: Retire LLVM_CXXFILT option")
Sponsored by: The FreeBSD Foundation
DeltaFile
+1-1usr.bin/Makefile
+1-11 files

HardenedBSD/src f65ebd3tools/test/stress2/misc renameat2.sh, usr.sbin/rtadvctl rtadvctl.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+75-57usr.sbin/rtadvd/config.c
+116-0tools/test/stress2/misc/renameat2.sh
+56-0usr.sbin/rtadvd/control_server.c
+46-0usr.sbin/rtadvctl/rtadvctl.c
+20-3usr.sbin/rtadvd/rtadvd.conf.5
+6-2usr.sbin/rtadvd/rtadvd.c
+319-626 files not shown
+327-6712 files

HardenedBSD/src 200edd6tools/test/stress2/misc renameat2.sh, usr.sbin/rtadvctl rtadvctl.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+75-57usr.sbin/rtadvd/config.c
+116-0tools/test/stress2/misc/renameat2.sh
+56-0usr.sbin/rtadvd/control_server.c
+46-0usr.sbin/rtadvctl/rtadvctl.c
+20-3usr.sbin/rtadvd/rtadvd.conf.5
+6-2usr.sbin/rtadvd/rtadvd.c
+319-626 files not shown
+327-6712 files

HardenedBSD/src 0951901usr.sbin/rtadvctl rtadvctl.c, usr.sbin/rtadvd config.c control_server.c

rtadvd: add multi pref64 support

Add support for multi pref64 in rtadvd and rtadvctl

Reviewed By: zlei, bz
Differential Revision: https://reviews.freebsd.org/D54636
DeltaFile
+75-57usr.sbin/rtadvd/config.c
+56-0usr.sbin/rtadvd/control_server.c
+46-0usr.sbin/rtadvctl/rtadvctl.c
+20-3usr.sbin/rtadvd/rtadvd.conf.5
+6-2usr.sbin/rtadvd/rtadvd.c
+1-2usr.sbin/rtadvd/rtadvd.h
+204-641 files not shown
+205-647 files

HardenedBSD/src e85f221libexec/rc/rc.d virtual_oss

rc: virtual_oss: Silence potential hw.snd.default_unit error

PR:             293582
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+1-1libexec/rc/rc.d/virtual_oss
+1-11 files

HardenedBSD/src b15dc3ftools/test/stress2/misc mmap45.sh mmap41.sh

stress2: Updated comments
DeltaFile
+2-1tools/test/stress2/misc/mmap45.sh
+2-1tools/test/stress2/misc/mmap41.sh
+4-22 files

HardenedBSD/src 05cbd5ftools/test/stress2/misc renameat2.sh

stress2: Added a new test scenario
DeltaFile
+116-0tools/test/stress2/misc/renameat2.sh
+116-01 files

HardenedBSD/src 8dd28e1lib/libc/quad Symbol.map

libc/quad: fix missing closing #endif in Symbol.map

Without this lib32 libc.so.7 would be missing critical symbols,
including malloc / free and all syscall wrappers.
DeltaFile
+1-0lib/libc/quad/Symbol.map
+1-01 files

HardenedBSD/src cc39531sys/contrib/dev/iwlwifi/mld mld.c, sys/contrib/dev/iwlwifi/mvm ops.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+14-0sys/contrib/dev/iwlwifi/mld/mld.c
+1-2sys/contrib/dev/iwlwifi/mvm/ops.c
+15-22 files

HardenedBSD/src a1251e7sys/contrib/dev/iwlwifi/mld mld.c, sys/contrib/dev/iwlwifi/mvm ops.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+14-0sys/contrib/dev/iwlwifi/mld/mld.c
+1-2sys/contrib/dev/iwlwifi/mvm/ops.c
+15-22 files

HardenedBSD/src 7db8503sys/contrib/dev/iwlwifi/mld mld.c

iwlwifi: mld: add LINUXKPI_PARAM_PREFIX

Add a LINUXKPI_PARAM_PREFIX to mld to properly export the
power_scheme module_param (sysctl).  This is especially needed given
mvm has the same parameter and we need to avoid a clash.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+4-0sys/contrib/dev/iwlwifi/mld/mld.c
+4-01 files

HardenedBSD/src 782fe2fsys/contrib/dev/iwlwifi/mld mld.c, sys/contrib/dev/iwlwifi/mvm ops.c

iwlwifi: adjust driver description

Adjust the module driver descriptions for mvm and mld to make it clear
that this is not a driver for Linux but a Linux-based driver for FreeBSD.
Cleanup surroundings.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+6-0sys/contrib/dev/iwlwifi/mld/mld.c
+1-2sys/contrib/dev/iwlwifi/mvm/ops.c
+7-22 files

HardenedBSD/src 551c4cbsys/contrib/dev/iwlwifi/mld mld.c

iwlwifi: mld: move module_init() to SI_ORDER_SECOND

In FreeBSD the iwlwifi driver is a single kernel module.
As for iwlwifi/mvm we need to make sure the common "iwlwifi drv" code
is initialized before trying to register the mld sub-driver
in order for lists, etc. in the registration code to be initialized.
We do this by using an extended (FreeBSD specific) version of
module_init which overrides the order parameter of the SYSINIT.
Otherwise we can randomly (depending on SYSINIT run order) run into
a NULL pointer deref panic.

Sponsored by:   The FreeBSD Foundation
PR:             291120
MFC after:      3 days
DeltaFile
+4-0sys/contrib/dev/iwlwifi/mld/mld.c
+4-01 files

HardenedBSD/src ef88cddcontrib/libedit ChangeLog, sys/compat/linuxkpi/common/src linux_80211.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+6,119-4contrib/libedit/ChangeLog
+524-167usr.sbin/bhyve/pci_virtio_scsi.c
+154-146sys/netinet6/nd6_rtr.c
+185-0sys/netinet6/nd6_nbr.c
+91-41sys/compat/linuxkpi/common/src/linux_80211.c
+55-51usr.sbin/bhyve/iov.c
+7,128-409134 files not shown
+8,327-909140 files

HardenedBSD/src ef30138lib/libsys rename.2, sys/amd64/amd64 trap.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+65-26lib/libsys/rename.2
+73-1sys/kern/vfs_vnops.c
+13-61sys/fs/nfsclient/nfs_clvnops.c
+42-15sys/amd64/amd64/trap.c
+35-14sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
+33-7sys/kern/vfs_syscalls.c
+261-12443 files not shown
+555-19749 files

HardenedBSD/src b57c0edsys/dev/iwx if_iwx.c, usr.bin/less lesspipe.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+16-5sys/dev/iwx/if_iwx.c
+1-1usr.bin/less/lesspipe.sh
+17-62 files

HardenedBSD/src 6812569usr.bin/less lesspipe.sh

lesspipe: Allow zstd to operate on a symlink

By default zstd refuses to operate on symlinks, so for example
`zless /var/crash/vmcore.last.zst` failed to view the uncompressed core
file.  Add -f to the zstd command line to allow operation on symlinks.

Reviewed by:    delphij
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55101

(cherry picked from commit b4305c90a3be7e1a40b76545b8b761fdbda5c309)
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 3e8a999sys/amd64/amd64 trap.c

amd64: extract uprintf_signal printing into a helper
DeltaFile
+25-15sys/amd64/amd64/trap.c
+25-151 files

HardenedBSD/src 272ea45sys/amd64/amd64 trap.c

amd64: print userspace fsbase and gsbase for uprintf_signal
DeltaFile
+19-2sys/amd64/amd64/trap.c
+19-21 files

HardenedBSD/src 5c71df9sys/fs/nfsclient nfs_clvnops.c nfs_clbio.c

nfsclient: convert to use vn_delayed_setsize()

Reviewed by:    rmacklem
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55595
DeltaFile
+7-61sys/fs/nfsclient/nfs_clvnops.c
+2-2sys/fs/nfsclient/nfs_clbio.c
+1-1sys/fs/nfsclient/nfs_clport.c
+0-1sys/fs/nfsclient/nfsnode.h
+10-654 files

HardenedBSD/src ef8292esys/compat/freebsd32 freebsd32_systrace_args.c freebsd32_syscall.h, sys/kern systrace_args.c

Regen
DeltaFile
+38-0sys/kern/systrace_args.c
+38-0sys/compat/freebsd32/freebsd32_systrace_args.c
+9-0sys/sys/sysproto.h
+2-1sys/sys/syscall.h
+2-1sys/compat/freebsd32/freebsd32_syscall.h
+2-1sys/sys/syscall.mk
+91-36 files not shown
+99-312 files