HardenedBSD/src 01691efsys/dev/isci/scil scic_sds_remote_node_table.c scic_sds_phy_registers.h, sys/dev/ixl ixl_txrx.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2sys/dev/isci/scil/scic_sds_remote_node_table.c
+2-2tools/tools/shlib-compat/shlib-compat.py
+1-1sys/dev/isci/scil/scic_sds_phy_registers.h
+1-1sys/dev/isci/scil/scic_sds_stp_request.h
+1-1sys/dev/ixl/ixl_txrx.c
+1-1usr.sbin/bsdconfig/share/common.subr
+8-83 files not shown
+11-119 files

HardenedBSD/src 6dd8631tests/sys/cam/ctl opcodes.sh all-supported-opcodes.txt

CTL: add ATF tests for REPORT SUPPORTED OPCODES

This includes a regression test for CVE-2024-42416

MFC after:      2 weeks
Sponsored by:   ConnectWise
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D46613
DeltaFile
+241-0tests/sys/cam/ctl/opcodes.sh
+39-0tests/sys/cam/ctl/all-supported-opcodes.txt
+2-0tests/sys/cam/ctl/Makefile
+282-03 files

HardenedBSD/src c52f565sys/dev/isci/scil scic_sds_remote_node_table.c scic_sds_phy_registers.h

isci(4): Fix a couple of typos in source code comments

- s/THis/This/
- s/impementation/implementation/

(cherry picked from commit adc41a72b8843047d02265a6ab2d8a5025a9ce89)
DeltaFile
+2-2sys/dev/isci/scil/scic_sds_remote_node_table.c
+1-1sys/dev/isci/scil/scic_sds_phy_registers.h
+1-1sys/dev/isci/scil/scic_sds_stp_request.h
+1-1sys/dev/isci/scil/scif_remote_device.h
+5-54 files

HardenedBSD/src eb44833tools/tools/shlib-compat shlib-compat.py

shlib-compat: Fix two typos in error messages

- s/implemeted/implemented/

(cherry picked from commit 3957e233dd9cf7b7599dd0a5efc59a78adfa9441)
DeltaFile
+2-2tools/tools/shlib-compat/shlib-compat.py
+2-21 files

HardenedBSD/src 54cfd9csys/dev/ixl ixl_txrx.c

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

- s/seperated/separated/

(cherry picked from commit ef3703a8cd9ade13d0c7a685577100e1fc18ee09)
DeltaFile
+1-1sys/dev/ixl/ixl_txrx.c
+1-11 files

HardenedBSD/src a8fac98sys/dev/bhnd bhnd_bus_if.m

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

- s/impementations/implementations/

(cherry picked from commit 04be4d04bbcbd061455b4424488b06927487a948)
DeltaFile
+1-1sys/dev/bhnd/bhnd_bus_if.m
+1-11 files

HardenedBSD/src 2078655usr.sbin/bsdconfig/share common.subr

bsdconfig(8): Fix a typo in a source code comment

- s/THis/This/

(cherry picked from commit b427b661be01e7b112531ba0b1ea27377a963bb8)
DeltaFile
+1-1usr.sbin/bsdconfig/share/common.subr
+1-11 files

HardenedBSD/src 903c46elib/libc/gen pause.3

pause.3: Fix a typo in the manual page

- s/reimplemeted/reimplemented/

(cherry picked from commit 9eea5eccf40d408ad22ac06d9962b3a98a0f0628)
DeltaFile
+1-1lib/libc/gen/pause.3
+1-11 files

HardenedBSD/src 76b90c1sys/netinet in_pcb.h

inpcb: remove last use of relic u_quad_t
DeltaFile
+1-1sys/netinet/in_pcb.h
+1-11 files

HardenedBSD/src 9b76228sys/kern uipc_ktls.c, sys/netinet tcp_timer.c in_pcb.h

inpcb: retire inp_vnet

Now that a functional inpcb can not outlive its socket, just use socket's
vnet pointer.
DeltaFile
+5-5sys/netinet/tcp_timer.c
+0-8sys/netinet/in_pcb.h
+2-2sys/kern/uipc_ktls.c
+0-3sys/netinet/in_pcb.c
+1-1sys/netinet/tcp_hpts.c
+8-195 files

HardenedBSD/src 8c941e3sys/x86/acpica acpi_apm.c

acpi_apm: Don't recurse on ACPI_LOCK in apmreadfilt

The lock is already held by the caller since it is used as the knlist
lock.

PR:             293901
Reported by:    Jiaming Zhang <r772577952 at gmail.com>
Fixes:          cc2715cf1f86 ("acpi_apm: Narrow scope of ACPI_LOCK")
DeltaFile
+0-2sys/x86/acpica/acpi_apm.c
+0-21 files

HardenedBSD/src 998d501share/man/man7 freebsd-base.7

freebsd-base.7: Add an example for unregistering

MFC after:              3 days
Reviewed by:            ivy, emaste
Discussed with:         bapt, des, emaste, ivy, phk, pi
Differential Revision:  https://reviews.freebsd.org/D55458
DeltaFile
+35-1share/man/man7/freebsd-base.7
+35-11 files

HardenedBSD/src 5f922bdshare/man/man7 freebsd-base.7

freebsd-base.7: Break examples into subsections

Break the examples into subsections, so that we can have multi-step
examples.

MFC after:              3 days (to 15 only)
Discussed with:         ivy
Differential Revision:  https://reviews.freebsd.org/D55526
DeltaFile
+6-5share/man/man7/freebsd-base.7
+6-51 files

HardenedBSD/src dc140a9share/skel dot.profile, usr.bin/apply apply.1

Bourne shell -> POSIX shell

The FreeBSD shell is a POSIX compatible shell. It evolved over several
decades from the Almquist shell, which was preceeded a decade before
that by the Bourne shell. Most readers today have never seen a Bourne
shell. If someone wants to learn to use our shell, they need to look for
tutorials on the POSIX shell. Align descriptions through out the tree
with this reality, consistent with it's manual and common parlance.

We made a similar change to the doc tree in b4d6eb01540fe.

MFC after:              3 days
Reviewed by:            carlavilla
Differential Revision:  https://reviews.freebsd.org/D56382
DeltaFile
+2-2usr.bin/script/script.1
+2-2usr.bin/fortune/datfiles/freebsd-tips
+1-1usr.bin/apply/apply.1
+1-1share/skel/dot.profile
+1-1usr.bin/chpass/chpass.1
+1-1usr.sbin/adduser/adduser.8
+8-86 files

HardenedBSD/src 934a35alib/libthr libthr.3

libthr.3: describe SIGTHR

Explain how SIGTHR is used and that it should be not touched by user
code.  Note about SIGLIBRT.

Reviewed by:    emaste
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D56384
DeltaFile
+19-0lib/libthr/libthr.3
+19-01 files

HardenedBSD/src fa912e3lib/libthr libthr.3

libthr.3: describe what we mean by C runtime environment.

Reviewed by:    emaste
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D56384
DeltaFile
+6-0lib/libthr/libthr.3
+6-01 files

HardenedBSD/src c574ee8stand/efi/loader main.c, stand/man loader.efi.8

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+55-88sys/dev/sound/pcm/channel.c
+12-1usr.bin/netstat/netstat.1
+6-6stand/man/loader.efi.8
+4-4stand/efi/loader/main.c
+2-5sys/dev/sound/pcm/channel.h
+3-3sys/dev/sound/pcm/feeder.c
+82-1074 files not shown
+86-11710 files

HardenedBSD/src 893b90cusr.bin/netstat netstat.1 main.c

netstat: Add -F support for -g

This change adds the ability to examine the contents of multicast
routing tables for other FIBs without the need for executing
`netstat` with `setfib(1)`.

MFC after:      3 days
Sponsored by:   Klara, Inc.
Sponsored by:   Stormshield
Differential Revision:  https://reviews.freebsd.org/D56205
Reviewed by:    glebius, markj, zlei

(cherry picked from commit cff675e83cdb6c9027e94df9d010439e42e27dee)
DeltaFile
+12-1usr.bin/netstat/netstat.1
+2-0usr.bin/netstat/main.c
+14-12 files

HardenedBSD/src 3524d4eshare/examples Makefile, share/examples/sound mmap.c

sound examples: Add mmap example

This example opens separate OSS capture and playback channels in mmap
mode, places them into a sync group, and starts them together so both
ring buffers advance on the same device timeline. It then monitors the
capture mmap pointer with SNDCTL_DSP_GETIPTR, converts that pointer into
monotonic absolute progress using the reported block count, and copies
newly recorded audio from the input ring to the matching region of the
output ring.

The main loop is driven by an absolute monotonic frame clock rather than
a fixed relative usleep delay. Wakeups are scheduled from the sample
rate using a small frame step similar to the SOSSO timing model, while
the audio path itself stays intentionally simple: just copy input to
output, with no explicit xrun recovery or processing beyond ring
wraparound handling.

MFC after:      1 week
Reviewed by:    christos
Differential Revision:  https://reviews.freebsd.org/D53749
DeltaFile
+297-0share/examples/sound/mmap.c
+1-0share/examples/Makefile
+298-02 files

HardenedBSD/src add68b4sys/net if_bridge.c

bridge(4): Remove epoch_enter during destruction

bridge doesn't require to enter epoch during destruction.

Reviewed by: zlei, glebius
Differential Revision: https://reviews.freebsd.org/D55935

(cherry picked from commit 17920f8335106487968d7928d01b34300756ea00)
DeltaFile
+0-5sys/net/if_bridge.c
+0-51 files

HardenedBSD/src 6af0ee7sys/net if_bridge.c

if_bridge(4): don't sleep under epoch(9) in destruction

bridge tries to run callout_drain(9) twice under epoch
during destruction.
once for bridge_timer, which is not required to be under epoch.
second time for the BSTP callout, which is already disabled
earlier inside bridge_delete_member.

Reviewed by: glebius, zlei
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D55876

(cherry picked from commit a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd)
DeltaFile
+2-2sys/net/if_bridge.c
+2-21 files

HardenedBSD/src 7d38eb7sys/net/route nhop_ctl.c

routing: Fix use-after-free in finalize_nhop

FIB_NH_LOG calls the `nhop_get_upper_family(nh)` to read
`nh->nh_priv->nh_upper_family` for failure logging.
Call FIB_NH_LOG before freeing nh so failures are logged
without causing a panic.

MFC after: 3 days
DeltaFile
+2-2sys/net/route/nhop_ctl.c
+2-21 files

HardenedBSD/src 7bccc0dsys/dev/sound/pcm channel.c

sound: De-macro array definitions in chn_calclatency()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56263

(cherry picked from commit 66a82f5fa471b8eda018b7566c3725a6742dfc0c)
DeltaFile
+16-21sys/dev/sound/pcm/channel.c
+16-211 files

HardenedBSD/src 6e5c351sys/dev/sound/pcm channel.c

sound: Simplify parts of chn_notify()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56240

(cherry picked from commit 8b18fc456bb136112e166508a9182718cdd44be2)
DeltaFile
+20-27sys/dev/sound/pcm/channel.c
+20-271 files

HardenedBSD/src f56d086sys/dev/sound/pcm channel.c

sound: Make chn_reset() control flow clearer

I think this is cleaner than playing around with return values.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56264

(cherry picked from commit 8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c)
DeltaFile
+18-15sys/dev/sound/pcm/channel.c
+18-151 files

HardenedBSD/src 573fd42sys/dev/sound/pcm channel.c channel.h

sound: Retire unused CHN_N_* defines

These still haven't been implemented by the original author, and there
doesn't seem to be much use for them anyway.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56239

(cherry picked from commit 2d84c8a3d3d673081c803f8aadc4eae8f6a221d8)
DeltaFile
+1-25sys/dev/sound/pcm/channel.c
+2-5sys/dev/sound/pcm/channel.h
+3-302 files

HardenedBSD/src 8b87f38sys/dev/sound/pcm feeder.c feeder.h

sound: Mark some snd_fmt* functions as static

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56238

(cherry picked from commit f369d4148b93410fe7f8ea989f66790403d23ce8)
DeltaFile
+3-3sys/dev/sound/pcm/feeder.c
+0-3sys/dev/sound/pcm/feeder.h
+3-62 files

HardenedBSD/src 4391323sys/net iflib.c

iflib: drain admin task and fix teardown order on register failure

When IFDI_ATTACH_POST() fails (or netmap attach fails), iflib tears down with
ether_ifdetach(), taskqueue_free(ifc_tq), and IFDI_DETACH(). CTX_LOCK is still
held after ether_ifattach. ether_ifdetach() and taskqueue_drain(admin) must not
run under CTX_LOCK.

Teardown ordering (match iflib_device_deregister):

- Free the per-interface admin taskqueue after IFDI_DETACH / IFDI_QUEUES_FREE, not before.
- Drop IFNET_WLOCK() across IFDI_DETACH / IFDI_QUEUES_FREE so driver detach can sleep in
LinuxKPI workqueue drain, then retake IFNET_WLOCK() before iflib_free_intr_mem and fail_unlock.

MFC after:      2 weeks
Reviewed by:    gallatin, kgalazka, #iflib
Differential Revision: https://reviews.freebsd.org/D56316
DeltaFile
+18-1sys/net/iflib.c
+18-11 files

HardenedBSD/src d2b96f6sys/net iflib.c

iflib: Fix panic observed while doing sysctl -a with if_bnxt unload

Observed below kernel panic calltrace while performing sysctl -a
operation while unloading the if_bnxt driver,

Fatal trap 9: general protection fault while in kernel mode

KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe02a7569940
vpanic() at vpanic+0x136/frame 0xfffffe02a7569a70
panic() at panic+0x43/frame 0xfffffe02a7569ad0
trap_fatal() at trap_fatal+0x68/frame 0xfffffe02a7569af0
calltrap() at calltrap+0x8/frame 0xfffffe02a7569af0

trap 0x9, rip = 0xffffffff80c0b411, rsp = 0xfffffe02a7569bc0, rbp = 0xfffffe02a7569be0 ---
sysctl_handle_counter_u64() at sysctl_handle_counter_u64+0x61/frame 0xfffffe02a7569be0
sysctl_root_handler_locked() at sysctl_root_handler_locked+0x9c/frame 0xfffffe02a7569c30
sysctl_root() at sysctl_root+0x22f/frame 0xfffffe02a7569cb0
userland_sysctl() at userland_sysctl+0x196/frame 0xfffffe02a7569d50

    [22 lines not shown]
DeltaFile
+24-21sys/net/iflib.c
+24-211 files

HardenedBSD/src 54f5d20share/man/man4 ciss.4

ciss.4: List all devices supported by ciss(4)

PR:             285744
Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56285
DeltaFile
+45-1share/man/man4/ciss.4
+45-11 files