HardenedBSD/src 41302c6sys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-932sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+0-378sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+0-320sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+0-175sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+0-172sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+0-120sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+0-2,09718 files not shown
+9-2,73524 files

HardenedBSD/src 069a8ffsys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-932sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+0-378sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+0-320sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+0-175sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+0-172sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+0-120sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+0-2,09718 files not shown
+9-2,73524 files

HardenedBSD/src e616025release/tools gce.conf, sys/cam/mmc mmc_xpt.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1-2release/tools/gce.conf
+1-1sys/cam/mmc/mmc_xpt.c
+1-1sys/dev/mps/mps.c
+1-1sys/dev/oce/oce_mbox.c
+1-1sys/net/altq/altq.h
+1-1sys/netgraph/bluetooth/include/ng_hci.h
+6-76 files

HardenedBSD/src 509a185sys/net80211 ieee80211_radiotap.c

net80211: fix bpf tap leak on wlan(4) detach

PR:     292337
Fixes:  8774a990ee4094f16d596d4b78e0f3239e5d0c88
DeltaFile
+9-6sys/net80211/ieee80211_radiotap.c
+9-61 files

HardenedBSD/src 24a20efrelease/tools gce.conf

GCE: Fix growfs path

The sed command was missing the ${DESTDIR} prefix, meaning it was
attempting to modify the build host's /etc/rc.d/growfs instead of
the target image's script. Tested in an arm64 builder that builds
as non-root.

PR:             kern/292081

(cherry picked from commit 709c1049fe0c6d0217e81268d4f33f7191474453)
DeltaFile
+1-1release/tools/gce.conf
+1-11 files

HardenedBSD/src 6c20edfrelease/tools gce.conf

GCE: Enable vtnet(4) Multiqueue.

Removes hw.vtnet.mq_disable=1.

This workaround was originally introduced nearly a decade ago to
address stability issues on KVM that have long since been resolved
in both the FreeBSD driver and the GCE hypervisor. Removing this
allows network interrupts to scale across multiple vCPUs.

Tested on n2-highcpu-16 VM with 15.0-RELEASE and confirmed multiple
queue pairs active and interrupts handling across cores.

PR:             kern/292081

(cherry picked from commit f604d84618ad478fa46ec374480cbcbc1d93bf07)
DeltaFile
+0-1release/tools/gce.conf
+0-11 files

HardenedBSD/src 3ae56f6sys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

Revert "ophgo: import new .dts"

This reverts commit b55d106df9785d141f9e3e1c916e921df9d877ac.

Per request of original author, manu, and mmel, revert this
change. While this is a genuinely cool device, there's some issues that
need to be sorted out before moving forward:

o Imported dt-bindings that weren't used and could interfere in the
  future.
o no platform code for sophgo, though it likely needs it
o Potential interference from the dts/dtsi files imported for future
  linux device-tree imports. These are the dts files from the vendor
  sdk, and history has down often upstream introduces enough change
  that keeping them here in the mean time lays the groundwork for
  merge conflicts in the future.

That makes this import premature.  Revert until it's more mature.
DeltaFile
+0-932sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+0-378sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+0-320sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+0-175sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+0-172sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+0-120sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+0-2,09717 files not shown
+0-2,72923 files

HardenedBSD/src 6946e9asys/dev/mps mps.c

mps(4): Fix a typo in a device message

- s/reseting/resetting/

(cherry picked from commit bcc735cb710fb74d1fb5f7be3d37701343c58ccd)
DeltaFile
+1-1sys/dev/mps/mps.c
+1-11 files

HardenedBSD/src 353e9cesys/cam/mmc mmc_xpt.c

mmc(4): Fix a typo in a device debug message

- s/reseting/resetting/

(cherry picked from commit 3b6f9481a85600cf1f23a819c3afee30fcd4122f)
DeltaFile
+1-1sys/cam/mmc/mmc_xpt.c
+1-11 files

HardenedBSD/src 0bedd06sys/net/altq altq.h

altq(4): Fix a typo in a source code comment

- s/backet/bucket/

(cherry picked from commit 1df4d82bd17ebd7449a6b58c32b65a12269ca068)
DeltaFile
+1-1sys/net/altq/altq.h
+1-11 files

HardenedBSD/src 72333f2sys/dev/oce oce_mbox.c

oce(4): Fix a typo in a device debug message

- s/depricated/deprecated/

(cherry picked from commit a3950d70a499e120c67da884865486e8599229bd)
DeltaFile
+1-1sys/dev/oce/oce_mbox.c
+1-11 files

HardenedBSD/src 4e3fbe5sys/netgraph/bluetooth/include ng_hci.h

ng_hci(4): Fix a typo in a source code comment

- s/depricated/deprecated/

(cherry picked from commit 756712d745db207085f1fe87dc8258434ec2147d)
DeltaFile
+1-1sys/netgraph/bluetooth/include/ng_hci.h
+1-11 files

HardenedBSD/src 5c67f04sys/netpfil/pf pf.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+4-2sys/netpfil/pf/pf.c
+4-21 files

HardenedBSD/src 71f4eb5sys/netpfil/pf pf.c

pf: don't reject route-to'd too-large packets

If we're sending a packet via pf_route()/pf_route6() we check for packet
size and potentially generate ICMP(6) packet too big messages. If we do,
don't consider this a rejected packet. That is, return PF_PASS and set
the mbuf to NULL rather than returning PF_DROP.

This matters for locally generated packets, because with PF_DROP we
can end up returning EACCES to userspace, causing the connection to
terminate. Instead, with PF_PASS and a NULL mbuf this is translated to
PFIL_CONSUMED, which does not return an error to userspace.

MFC after:      2 weeks
Sponsored by:   Rubicon Communications, LLC ("Netgate")

(cherry picked from commit 2e7699355f08258365fb5f65d11ac297e20f78de)
DeltaFile
+4-2sys/netpfil/pf/pf.c
+4-21 files

HardenedBSD/src c3ad8e4lib/libpmc/pmu-events/arch/x86/amdzen5 data-fabric.json floating-point.json, sys/contrib/device-tree/src/riscv/sophgo cv181x_base.dtsi

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,634-0lib/libpmc/pmu-events/arch/x86/amdzen5/data-fabric.json
+932-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+812-0lib/libpmc/pmu-events/arch/x86/amdzen5/floating-point.json
+0-685sys/powerpc/booke/spe.c
+517-0lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json
+457-0lib/libpmc/pmu-events/arch/x86/amdzen5/recommended.json
+4,352-685143 files not shown
+8,787-3,349149 files

HardenedBSD/src e7c73e4sys/cddl/contrib/opensolaris/uts/common/sys isa_defs.h, sys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+932-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+378-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+320-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+2-204sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
+175-0sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+172-0sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+1,979-20428 files not shown
+2,743-22934 files

HardenedBSD/src 9356ea8sys/vm vm_object.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-3sys/vm/vm_object.h
+2-31 files

HardenedBSD/src b55d106sys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

ophgo: import new .dts

Signed-off-by: Martin Filla <freebsd at sysctl.cz>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1844
DeltaFile
+932-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+378-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+320-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+175-0sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+172-0sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+120-0sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+2,097-017 files not shown
+2,729-023 files

HardenedBSD/src c29ec2esys/cddl/compat/opensolaris/sys cpuvar_defs.h, sys/cddl/contrib/opensolaris/uts/common/dtrace fasttrap.c

cddl: remove sparc and mips code

Signed-off-by: Minsoo Choo <minsoochoo0122 at proton.me>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1910
DeltaFile
+2-204sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
+0-7sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
+0-5sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+0-4sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
+0-3sys/cddl/compat/opensolaris/sys/cpuvar_defs.h
+2-2235 files

HardenedBSD/src 3e8619eusr.sbin/bsdinstall/scripts zfsboot

bsdinstall: Create separate datasets for directories in /usr/ports

Both distfiles & packages contain compressed files.

Signed-off-by: Ricardo Branco <rbranco at suse.de>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1873
DeltaFile
+2-0usr.sbin/bsdinstall/scripts/zfsboot
+2-01 files

HardenedBSD/src e28529csys/amd64/conf GENERIC, sys/conf NOTES

rge: Add to amd64 GENERIC and to sys/conf/NOTES

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D54609
DeltaFile
+2-0sys/conf/NOTES
+1-0sys/amd64/conf/GENERIC
+3-02 files

HardenedBSD/src 849c0ebusr.sbin/pkg FreeBSD.conf.quarterly FreeBSD.conf.latest

Comments: FreeBSD.conf should not be overwritten

The files /usr/sbin/pkg/FreeBSD.conf.* currently set base repo to {enable: no}.
We don't want to overwrite /local/etc/pkg/repos/FreeBSD.conf that already exists
when users choose tech preview in the installation.

Signed-off-by: Guilherme Augusto de Souza Candinho <cndghm at gmail.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1925
DeltaFile
+3-2usr.sbin/pkg/FreeBSD.conf.quarterly
+2-2usr.sbin/pkg/FreeBSD.conf.latest
+2-2usr.sbin/pkg/FreeBSD.conf.quarterly-release
+7-63 files

HardenedBSD/src 42541e8sys/vm vm_object.h

vm_object.h: tweak OBJ_ONEMAPPING comment even more

(cherry picked from commit dcb80621bbf9a733b91f1a011af873318fac2709)
DeltaFile
+2-3sys/vm/vm_object.h
+2-31 files

HardenedBSD/src 7c1c237share/mk bsd.opts.mk

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-15share/mk/bsd.opts.mk
+0-151 files

HardenedBSD/src f74a3c3lib/libpmc/pmu-events/arch/x86/amdzen5 data-fabric.json floating-point.json, sys/dev/smartpqi smartpqi_controllers.h

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

Conflicts:
        share/mk/bsd.opts.mk (unresolved)
DeltaFile
+1,634-0lib/libpmc/pmu-events/arch/x86/amdzen5/data-fabric.json
+812-0lib/libpmc/pmu-events/arch/x86/amdzen5/floating-point.json
+0-685sys/powerpc/booke/spe.c
+517-0lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json
+457-0lib/libpmc/pmu-events/arch/x86/amdzen5/recommended.json
+371-0sys/dev/smartpqi/smartpqi_controllers.h
+3,791-685110 files not shown
+6,059-3,120116 files

HardenedBSD/src b58d5c5sys/dev/sound sndstat.c dummy.c, sys/dev/sound/midi midi.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+0-1,456sys/dev/sound/pcm/sndstat.c
+1,454-0sys/dev/sound/sndstat.c
+81-314sys/dev/sound/midi/midi.c
+16-36sys/dev/sound/pcm/feeder_rate.c
+48-2sys/dev/sound/dummy.c
+42-0sys/dev/sound/sndstat.h
+1,641-1,80834 files not shown
+1,749-2,00740 files

HardenedBSD/src 17ba6f4sys/fs/fuse fuse_vnops.c fuse_ipc.c, tests/sys/fs/fusefs ioctl.cc mockfs.cc

fusefs: support FUSE_IOCTL

MFC After: 1 week
Signed-off-by: CismonX <admin at cismon.net>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1470
DeltaFile
+213-0tests/sys/fs/fusefs/ioctl.cc
+89-6sys/fs/fuse/fuse_vnops.c
+12-1tests/sys/fs/fusefs/mockfs.cc
+4-0sys/fs/fuse/fuse_ipc.c
+1-2sys/fs/fuse/fuse_internal.c
+2-0tests/sys/fs/fusefs/mockfs.hh
+321-91 files not shown
+322-97 files

HardenedBSD/src 3ecd098sys/dev/sound/midi midi.c

sound: Retire unused snd_midi->name

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit a9c3bb39bc9181b8762e67c40d00886474e9ae06)
DeltaFile
+0-1sys/dev/sound/midi/midi.c
+0-11 files

HardenedBSD/src f309214sys/dev/sound/usb uaudio.c

snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan

This is a layering violation, but it also makes the control flow
confusing; snd_uaudio(4) should have its own lock to protect its
structures.

Fixes:          5cc34a83e1 ("Revert "sound: Merge chn_intr() with chn_intr_locked()"")
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54102

(cherry picked from commit c234740c9d34c2b953c6010f6a01b0aca9648c08)
DeltaFile
+12-15sys/dev/sound/usb/uaudio.c
+12-151 files

HardenedBSD/src 76a53e1sys/dev/sound/midi mpu401.c

sound: Allocate mpu401 with M_WAITOK

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit fd1312d3629cda9691c67af6154946cd55467076)
DeltaFile
+1-4sys/dev/sound/midi/mpu401.c
+1-41 files