HardenedBSD/src 8ad93edsys/dev/sound/pcm feeder_volume.c, sys/kern uipc_shm.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+231-246sys/netinet/in_pcb.h
+10-1sys/dev/sound/pcm/feeder_volume.c
+2-0sys/kern/uipc_shm.c
+1-0usr.bin/calendar/calendars/calendar.freebsd
+0-1sys/net/debugnet_inet.c
+244-2485 files

HardenedBSD/src 8624944sys/dev/sound/pcm feeder_volume.c, sys/net debugnet_inet.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+231-246sys/netinet/in_pcb.h
+10-1sys/dev/sound/pcm/feeder_volume.c
+0-1sys/net/debugnet_inet.c
+1-0usr.bin/calendar/calendars/calendar.freebsd
+242-2484 files

HardenedBSD/src 4c72e5cusr.bin/calendar/calendars calendar.freebsd

calendar.freebsd: add myself (khorben@)

This adds my date and place of birth to FreeBSD's calendar file, so I
can let the system(tm) remind me when that counter increments.

Confirmed to be working with the following command:

```
$ calendar -f usr.bin/calendar/calendars/calendar.freebsd -t 18.08
Aug 18  Pierre Pronchery <khorben at FreeBSD.org> born in Nantes, France, 1982
[...]
```

Reviewed by:    philip (mentor)
Approved by:    philip (mentor)
Differential Revision:  https://reviews.freebsd.org/D55825
DeltaFile
+1-0usr.bin/calendar/calendars/calendar.freebsd
+1-01 files

HardenedBSD/src b094b48sys/kern uipc_shm.c

HBSD: Make sure the kinfo_file struct always gets zeroed

Similar to FreeBSD commit 25cc459286a02b646751541ccde5a33319471c73,
apply a memset in one of the core functions used to fill the structure.
This ensures that all kinfo_file structure allocations are zeroed (at
least, at the point of calling shm_fill_kinfo_locked).

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
MFC-to:         15-STABLE
DeltaFile
+2-0sys/kern/uipc_shm.c
+2-01 files

HardenedBSD/src 041e9ebsys/netinet in_pcb.h

inpcb: overhaul in_pcb.h

Pull up all user-visible stuff to the top of the file and isolate the
rest under _KERNEL.  The user visible parts are:
- struct in_conninfo
- struct xinpcb
- defines for inp_flags bits, that are shared between xinpcb and inpcb

PR:     293493
DeltaFile
+231-246sys/netinet/in_pcb.h
+231-2461 files

HardenedBSD/src 0f1aa45sys/net debugnet_inet.c

debugnet: don't include udp_var.h

The module constructs UDP packets, but doesn't use the UDP stack.
DeltaFile
+0-1sys/net/debugnet_inet.c
+0-11 files

HardenedBSD/src ac5ff28sys/dev/sound/pcm feeder_volume.c

sound: enforce MASTER volume mute during playback

MASTER mute (vol.mute) works while audio is playing. However, if a
stream is stopped and restarted (PCMTRIG_STOP -> PCMTRIG_START), the
audio will resume even though the mixer shows the MASTER volume as
muted. Other streams that are already playing remain silent. New streams
may also start playing audio regardless of the MASTER mute state.

The volume feeder now considers the MASTER mute when determining whether
a channel should be muted. This ensures MASTER mute is consistently
enforced for all streams and removes the dependency on trigger-driven
state propagation.

Tested with Creative Labs CA0132 card.

MFC after:      1 week
Reviewed by:    christos
Differential Revision:  https://reviews.freebsd.org/D55605
DeltaFile
+10-1sys/dev/sound/pcm/feeder_volume.c
+10-11 files

HardenedBSD/src 5d9c41csys/fs/fuse fuse_node.h fuse_node.c, sys/netinet ip_carp.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+122-315sys/netinet/ip_carp.c
+192-0tests/sys/fs/fusefs/read.cc
+11-121usr.bin/systat/netstat.c
+80-11sys/fs/fuse/fuse_node.h
+90-0tests/sys/fs/fusefs/rename.cc
+71-18sys/fs/fuse/fuse_node.c
+566-46524 files not shown
+816-59830 files

HardenedBSD/src b7a704dsys/fs/fuse fuse_node.h fuse_node.c, sys/netinet ip_carp.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+122-315sys/netinet/ip_carp.c
+192-0tests/sys/fs/fusefs/read.cc
+11-121usr.bin/systat/netstat.c
+80-11sys/fs/fuse/fuse_node.h
+90-0tests/sys/fs/fusefs/rename.cc
+71-18sys/fs/fuse/fuse_node.c
+566-46524 files not shown
+816-59830 files

HardenedBSD/src cedaa6dsbin/camcontrol camcontrol.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+31-0sbin/camcontrol/camcontrol.c
+31-01 files

HardenedBSD/src 815ef05sys/netinet tcp_var.h in_pcb.h, sys/netinet/cc cc.h

netinet: remove _WANT_INPCB and _WANT_TCPCB

These were hacks since FreeBSD 12 that provided some transition period for
utilities to migrate from reading kernel memory via kvm(3) to sysctl(3)
based APIs.  The transition period is over.
DeltaFile
+4-4sys/netinet/cc/cc.h
+2-2sys/netinet/tcp_var.h
+1-1sys/netinet/in_pcb.h
+7-73 files

HardenedBSD/src c0462c2sys/netinet/tcp_stacks sack_filter.c

tcp: make sack_filter.c compilable without _WANT_TCPCB

This file can be compiled as a standalone program for debugging purposes.
Achieve that without exposing hack from tcp_var.h that is destined for
removal.
DeltaFile
+15-14sys/netinet/tcp_stacks/sack_filter.c
+15-141 files

HardenedBSD/src 985ac74usr.bin/systat netstat.c systat.h

systat: remove kvm(3) support for -netstat mode

The kvm(3) mode was actually non-functional since FreeBSD 8 for kernels
with VIMAGE, since FreeBSD 12 for the GENERIC kernel and since FreeBSD 14
for all kernels.  The reason for that is that systat(1) tried to lookup
symbol "tcb" to check if kvm(3) is working.  The symbol no longer exist in
the kernel.

A side effect was that systat(1) lost true kvm(3) support for all other
modes, e.g. -swap or -pigs.  The tool was still working, but libkvm was
just a shim to sysctl(3) API.

So, contrary to what the header line says, this change actually restores
the kvm(3) support for other modes.  Now we read the "allproc" symbol.

This was the last tool that abused _WANT_INPCB.
DeltaFile
+11-121usr.bin/systat/netstat.c
+0-11usr.bin/systat/systat.h
+3-2usr.bin/systat/main.c
+0-2usr.bin/systat/extern.h
+14-1364 files

HardenedBSD/src a68e3a8sys/net pfvar.h, sys/sys systm.h

systm.h: don't declare socket and inpcb globally
DeltaFile
+0-2sys/sys/systm.h
+1-0sys/net/pfvar.h
+1-22 files

HardenedBSD/src 72472e5sbin/ifconfig carp.c, share/man/man4 carp.4

carp: retire ioctl(2) API

All supported stable branches use netlink(4) API to configure carp(4).
The deleted code also has kernel stack leak vulnerability, that requires
extra effort to fix.

Reviewed by:            pouria, kp
Differential Revision:  https://reviews.freebsd.org/D55804
DeltaFile
+122-315sys/netinet/ip_carp.c
+0-15sys/netinet/ip_carp.h
+3-9share/man/man4/carp.4
+0-10sys/net/if.c
+7-2sbin/ifconfig/carp.c
+1-1sys/sys/param.h
+133-3526 files

HardenedBSD/src 7e68af7sys/fs/fuse fuse_node.h fuse_node.c, tests/sys/fs/fusefs read.cc rename.cc

fusefs: redo vnode attribute locking

Previously most fields in fuse_vnode_data were protected by the vnode
lock.  But because DEBUG_VFS_LOCKS was never enabled by default until
stable/15 the assertions were never checked, and many were wrong.
Others were missing.  This led to panics in stable/15 and 16.0-CURRENT,
when a vnode was expected to be exclusively locked but wasn't, for fuse
file systems that mount with "-o async".

In some places it isn't possible to exclusively lock the vnode when
accessing these fields.  So protect them with a new mutex instead.  This
fixes panics and unprotected field accesses in VOP_READ,
VOP_COPY_FILE_RANGE, VOP_GETATTR, VOP_BMAP, and FUSE_NOTIFY_INVAL_ENTRY.
Add assertions everywhere the protected fields are accessed.

Lock the vnode exclusively when handling FUSE_NOTIFY_INVAL_INODE.

During fuse_vnode_setsize, if the vnode isn't already exclusively
locked, use the vn_delayed_setsize mechanism.  This fixes panics during

    [13 lines not shown]
DeltaFile
+192-0tests/sys/fs/fusefs/read.cc
+80-11sys/fs/fuse/fuse_node.h
+90-0tests/sys/fs/fusefs/rename.cc
+71-18sys/fs/fuse/fuse_node.c
+74-7sys/fs/fuse/fuse_vnops.c
+24-18sys/fs/fuse/fuse_internal.c
+531-545 files not shown
+609-7911 files

HardenedBSD/src ce9aff8sys/dev/hwpmc hwpmc_amd.c

hwpmc_amd: fix amd_get_msr() MSR offset for newer counter bases

The previous code subtracted AMD_PMC_PERFCTR_0 (0xC0010004) from all
perfctr MSR addresses to compute a relative offset. This is incorrect
for counters using AMD_PMC_CORE_BASE (0xC0010200), AMD_PMC_L3_BASE
(0xC0010230), and AMD_PMC_DF_BASE (0xC0010240), producing wrong offsets.

Fix by promoting amd_core_npmcs, amd_l3_npmcs, and amd_df_npmcs to
static module-level variables and computing the correct flat RDPMC
index per AMD BKDG 24594 page 440:

ECX 0-5:   Core counters 0-5
ECX 6-9:   DF counters 0-3
ECX 10-15: L3 Cache counters 0-5
ECX 16-27: DF counters 4-15
ECX > 27:  Reserved, returns EINVAL

Reviewed by:    Ali Mashtizadeh <ali at mashtizadeh.com>, mhorne
Sponsored by:   NLINK (https://nlink.com.br), Recife, Brazil

    [2 lines not shown]
DeltaFile
+33-3sys/dev/hwpmc/hwpmc_amd.c
+33-31 files

HardenedBSD/src 25cc459sys/kern uipc_shm.c

shm: Zero struct kinfo_file in sysctl handler

Reported by: Calif.io in collaboration with Claude and Anthropic Research
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55806
DeltaFile
+1-1sys/kern/uipc_shm.c
+1-11 files

HardenedBSD/src a2b2ce2share/man/man9 DEFINE_IFUNC.9

DEFINE_IFUNC.9: update NOTES

ifuncs are now implemented for all architectures, so drop the caveat
statement.

Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55815
DeltaFile
+3-4share/man/man9/DEFINE_IFUNC.9
+3-41 files

HardenedBSD/src d74dfe0sbin/camcontrol camcontrol.c

camcontrol: Add SPDX-License-Identifier tag

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55269

(cherry picked from commit 25ed5ee654a8cd7d9f694307c62bb84ff4d16866)
DeltaFile
+2-0sbin/camcontrol/camcontrol.c
+2-01 files

HardenedBSD/src b1d4b83sbin/camcontrol camcontrol.c

camcontrol: Print 'transport revision'

As described in Serial ATA Revision 3.5a

Reviewed by:    mav
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2044

(cherry picked from commit f4f9054dc47b430872d38c7a75fea753c6fe796f)
DeltaFile
+29-0sbin/camcontrol/camcontrol.c
+29-01 files

HardenedBSD/src 79d1b27sys/amd64/amd64 mp_machdep.c, sys/amd64/include smp.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+2-22 files

HardenedBSD/src c0d9a18sys/amd64/amd64 mp_machdep.c, sys/amd64/include smp.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+2-22 files

HardenedBSD/src c41a8d8. Makefile.inc1

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+18-32Makefile.inc1
+18-321 files

HardenedBSD/src 5f0ab9dsys/amd64/amd64 mp_machdep.c, sys/amd64/include smp.h

amd64: Make start_all_aps() static

It is not used elsewhere since the change [1].

[1] ac3ede5371af x86/xen: remove PVHv1 code

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55668
DeltaFile
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+2-22 files

HardenedBSD/src 2a3d650. Makefile.inc1

packages: Don't create empty packages

If a package plist only contains directories, but no files, do not
create the package.

This fixes an issue where setting "package=foo" in mtree causes the
"foo" package to always be created, even if nothing else installs in
that package, because the mtree entry is always added to the plist.

This most often happens:

* With architecture-specific directories, because mtree can't install
  a directory conditionally based on architecture, and

* With packages that are completely empty when a particular src.conf
  knob is disabled, because mtree will still create the directories.

Although it's theoretically possible that we might want to create a
package that only contains directories, there are no such packages

    [8 lines not shown]
DeltaFile
+18-11Makefile.inc1
+18-111 files

HardenedBSD/src 1346ffb. Makefile.inc1

Makefile.inc1: Remove svn support

We don't need this, and we don't use this. It's left over from the svn
days. We stopped supporting svn as a project entirely when 12.x went
EOL. And VCS_REVSION isn't in any current ucl file or anywhere else in
the tree.

Sponsored by:           Netflix
Reviewed by     :       kevans, brd
Differential Revision:  https://reviews.freebsd.org/D52912

(cherry picked from commit 28b858f5059c8b25fa08be494699997000fce58c)

Makefile.inc1: Add back missing if

The .if defined(_MKSHOWCONFIG) covered an unusually large area, so it
should have not been removed in the last commit. I must have tested in
the wrong tree before pushing...


    [4 lines not shown]
DeltaFile
+1-22Makefile.inc1
+1-221 files

HardenedBSD/src f9a4771sys/cam cam_xpt.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+4-0sys/cam/cam_xpt.c
+4-01 files

HardenedBSD/src f335c0esys/cam cam_xpt.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+4-0sys/cam/cam_xpt.c
+4-01 files

HardenedBSD/src ce17e2alib/libmt mtlib.c, usr.bin/mt mt.1

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+8-1usr.bin/mt/mt.1
+2-0lib/libmt/mtlib.c
+10-12 files