FreeBSD/src 0a12444 — tools/tools/netmap pkt-gen.c

pkt-gen: fix UDP checksum when IPv6 address ranges are used

update_ip6() left the UDP checksum stale for most packets. Unlike
update_ip(), it computed the incremental checksum delta only after the
source-address wrap, so every earlier "break" (port increment, address
increment, and both random paths) returned with udp_sum still 0 and no
correction applied. The trailing delta block also re-read oaddr/naddr
after they had been reassigned, so the source and destination deltas
could not both be accounted for.

Fold each delta in with new_udp_sum() before the corresponding break,
mirroring the structure update_ip() already uses, and drop the stale
trailing block. IPv4 was not affected.

Verified by driving update_addresses() directly and recomputing every
checksum from scratch over the real pseudo-header: 128 packets across
six range configurations, 12 mismatches before, 0 after. IPv4 passes
both before and after.

Submitted by:   Olivier Cochard-Labbé <olivier at cochard.me>
DeltaFile
+14-16tools/tools/netmap/pkt-gen.c
+14-161 files

FreeBSD/src ce1dc2d — sys/dev/netmap netmap_bdg.c

netmap: bdg: replace strncpy with safer strlcpy

Submitted by:   Brian Poole <brian90013 at gmail.com>
DeltaFile
+2-1sys/dev/netmap/netmap_bdg.c
+2-11 files

FreeBSD/src caffcee — sys/kern subr_busdma_bounce.c

busdma_bounce: fix unused-function warning on powerpc

static inline, and powerpc's own must_bounce() never
calls it.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D58825

(cherry picked from commit 087d722624c7293c2cbc5ab2bc1e20b6a68aae96)
DeltaFile
+1-1sys/kern/subr_busdma_bounce.c
+1-11 files

FreeBSD/src 384bf14 — sys/dev/firewire fwohcivar.h fwohci.c

fwohci: fix LPS delay, PHY_INT storm, and SID timeout recovery

Fixed the post-LPS delay from 500us to the IEEE 1394a-2000 s6.1 mandated
10ms ceiling. Handled PHY_INT by clearing W1C status bits in register 5
(masked ISBR to avoid spurious bus resets). Added a SID timeout callout
that recovers the state machine when a remote device fails to complete
self-ID. Fixed FW_PHY_SPD operator precedence and gated noisy messages
behind bootverbose/firewire_debug.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D58033

(cherry picked from commit 4b3d035668211c19fc6fd5d4d207c2e8f96e7ad3)
DeltaFile
+51-8sys/dev/firewire/fwohci.c
+3-0sys/dev/firewire/fwohcivar.h
+54-82 files

FreeBSD/src e846a85 — sys/dev/firewire if_fwe.c

fwe: add missing net epoch around ether_input

Wrap the if_input() call in fwe_as_input() with NET_EPOCH_ENTER/EXIT.
The network stack requires epoch protection when delivering packets
via if_input, and fwe was missing it.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D57459

(cherry picked from commit a620746da173d1583b342b096419297e33d0ed15)
DeltaFile
+3-0sys/dev/firewire/if_fwe.c
+3-01 files

FreeBSD/src 6b649b1 — sys/dev/sdhci sdhci_pci.c sdhci.h

sdhci: don't infer a non-removable slot on Apollo Lake SDXC

Intel Apollo Lake SDXC controller reports a Slot Type of
"Embedded Slot for One Device" in SDHCI_CAPABILITIES bits, even
when the slot is a removable card reader.
This caused 48 timeouts before the boot sequence resumed.

Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D58467

(cherry picked from commit 248d537e4ca7295a08bab60e82633d332d36e525)
DeltaFile
+2-1sys/dev/sdhci/sdhci.c
+2-0sys/dev/sdhci/sdhci.h
+1-0sys/dev/sdhci/sdhci_pci.c
+5-13 files

FreeBSD/src 618bedf — sys/dev/firewire if_fwip.c

fwip: Fix M_PKTHDR loss in fwip_async_output broadcast path

M_PREPEND in the broadcast branch may call m_prepend(9) which allocates
a new head mbuf and calls m_move_pkthdr(), stripping M_PKTHDR from the
old mbuf.

xfer->mbuf was set before M_PREPEND, so it pointed at the
deheadered old mbuf. bus_dmamap_load_mbuf(9) asserts M_PKTHDR and
panics.

Reviewed by:    zlei, adrian
Differential Revision:  https://reviews.freebsd.org/D57495

(cherry picked from commit 22ddc9eb1d7a4fffe78b0692bdc4ec03e1d04ac4)
DeltaFile
+15-7sys/dev/firewire/if_fwip.c
+15-71 files

FreeBSD/src add962b — sys/dev/hid ietp.c

ietp: guard iicbus_get_addr with devclass check

When a USB HID device triggers identify,
the grandparent is usbhid on a USB hub.
Calling iicbus_get_addr() on a non-iicbus device
hits a KASSERT panic.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D58432

(cherry picked from commit 3fbffbcbec88932d7c7b024aca5a1e26a36f13a4)
DeltaFile
+6-5sys/dev/hid/ietp.c
+6-51 files

FreeBSD/src 2a535ed — sys/dev/acpica acpi.c

acpi: parse resources of not-present devices that are kept enabled

acpi_probe_child() keeps PCI link devices, the RTC,
and docking stations enabled even when _STA reports them not present,
but skipped acpi_parse_resources() for them. With an empty resource
list, resource-based hint matching (BUS_HINT_DEVICE_UNIT) cannot wire
such a device to its hinted unit, and the hinted ISA device is then
created as a duplicate.

Modern AMI firmware reports the PNP0B00 RTC as not present while
handing timekeeping to the ACPI Time-and-Alarm device.

Reviewed by:    adrian, jhb
Differential Revision:  https://reviews.freebsd.org/D58047

(cherry picked from commit 21bc31ce2e4a7106ec352c9e30fc6d948b881653)
DeltaFile
+35-24sys/dev/acpica/acpi.c
+35-241 files

FreeBSD/src 9f3c685 — sys/dev/ichsmb ichsmb_pci.c

ichsmb: add Ice Lake-LP (0x34a3) and Ice Lake-N (0x38a3) SMBus device IDs

Add PCI device IDs for two Ice Lake PCH SMBus controller variants:
- 0x34a3 (Ice Lake-LP), previously listed as the generic "Ice Lake" entry (ID_ICELAKE), renamed to ID_ICELAKELP for clarity.
- 0x38a3 (Ice Lake-N), a separate PCH variant not previously supported.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D56732

(cherry picked from commit 081d3ab24e03d271a0de3b173802fbe71f52e8aa)
DeltaFile
+6-3sys/dev/ichsmb/ichsmb_pci.c
+6-31 files

FreeBSD/src fedc3c4 — sys/dev/usb usbdevs

usbdevs: Add USB device IDs for Nuand bladeRF SDR

Add vendor and product IDs for bladeRF family of USB software defined radios manufactured by Nuand LLC.

Reviewed by:    imp, adrian
Differential Revision:  https://reviews.freebsd.org/D54733

(cherry picked from commit e7de7feb74262bfdb04d285846bac2fc6229f734)
DeltaFile
+7-0sys/dev/usb/usbdevs
+7-01 files

FreeBSD/src 2e2f55c — sys/dev/usb/wlan if_mtw.c

mtw: Fix firmware loading and memory leaks

- Skip firmware reload if MCU already initialized
- Fix firmware_put() memory leaks on error paths
- Increase MCU init timeout to 15 seconds
- Use debug macros instead of device_printf for verbose output
- Remove unused 'ret' variable
- Fix space indentation to tabs per style(9)

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D57597

(cherry picked from commit f981fa12b760a5f0983eeec8065a4dec5295ab24)
DeltaFile
+60-43sys/dev/usb/wlan/if_mtw.c
+60-431 files

FreeBSD/src 136ddcb — sys/dev/ichsmb ichsmb_pci.c

ichsmb: Add Intel Raptor Lake SMBus controller support

Add PCI device ID 0x7a23 for Intel 700 Series (Raptor Lake) chipset SMBus controller.
This enables hardware monitoring functionality on 13th and 14th generation Intel Core platforms.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D54957

(cherry picked from commit e4bcfe4ebf03e321a5f8317491cdeea49e4f6357)
DeltaFile
+3-0sys/dev/ichsmb/ichsmb_pci.c
+3-01 files

FreeBSD/src 97ab9dc — sys/x86/cpufreq est.c

est: gate "not recognized" message behind bootverbose

On modern Intel CPUs that use HWP (hwpstate_intel: /usr/src/sys/x86/cpufreq/hwpstate_intel.c) instead of EST,
this message prints unconditionally during probe even though it is
expected and harmless. Gated behind bootverbose to reduce console
noise on systems where EST is present but considered legacy.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D57616

(cherry picked from commit 85814f5912618808ebe5b7065b70344675c98b5b)
DeltaFile
+4-3sys/x86/cpufreq/est.c
+4-31 files

FreeBSD/src f0cbd0b — sys/dev/usb/wlan if_mtw.c

mtw(4): Fix warm reboot initialization failures for MT7601U

  The mtw(4) driver works correctly on initial boot, but fails to initialize
  the MT7601U WiFi adapter after a warm reboot.

  Users must either physically unplug and replug the USB adapter, or perform a
  full power cycle to restore functionality, if usb power is always powered
  (only a replug works)

  The root cause is that warm reboot does not power-cycle USB devices,
  leaving the MT7601U in a stale state from the previous session.

  The MCU retains its ready flag and the device ignores initialization
  commands, resulting in timeout waiting for MCU to initialize errors.

  At the OS Level, pinging 1.1.1.1 will work, but the speed will be very
  slow. In addition in debug mode, we see thousand of error logs.

  This patch addresses the issue by:

    [24 lines not shown]
DeltaFile
+27-6sys/dev/usb/wlan/if_mtw.c
+27-61 files

FreeBSD/src a1b3329 — sys/dev/sound/pci/hda hdaa.c

snd_hda: use the pin ELD to select DisplayPort audio framing

hdaa_audio_setup() reads the converter widget's ELD when choosing
between HDMI and DisplayPort audio infoframes. ELD is stored on the
output pin, so the converter has no ELD and the driver selects HDMI
framing even when the connected display uses DisplayPort.

Read the ELD from the output pin to select the correct audio framing.

The equivalent change was tested on DragonFly BSD with an Intel Kaby
Lake display-audio codec and an LG HDR 4K monitor connected over
DisplayPort. Before the change, converter node 2 had no ELD, while
output pin 5 had an 83-byte ELD identifying DisplayPort. Captured driver
commands programmed HDMI audio infoframe bytes (84 01 0a 70 01 00 00
00). After applying the change and rebooting, the commands used the
existing DisplayPort form (84 1b 44 01 00 00 00), and console tones and
desktop audio were audible.

PR:             299094

    [6 lines not shown]
DeltaFile
+2-2sys/dev/sound/pci/hda/hdaa.c
+2-21 files

FreeBSD/src 9da2c05 — sys/kern kern_mib.c

kern: Remove unreachable compat_freebsd8 FEATURE

COMPAT_FREEBSD8 does not exist as a kernel option, so this is dead code.

No functional change intended.

Fixes:          e256f71389fb ("kernel: add missed FEATUREs compat_freebsd 8-14")
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Reviewed by:    kib
Pull-Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/80
DeltaFile
+0-4sys/kern/kern_mib.c
+0-41 files

FreeBSD/src 8df5184 — sbin/route route.8

route: remove reference to long-gone netiso protocol in route(8).
DeltaFile
+1-1sbin/route/route.8
+1-11 files

FreeBSD/src 5764cc6 — tests/sys/kern unix_passfd_test.c

tests/unix_passfd: fix typos - assignment instead of comparison

This typos were actually hiding a kernel bug, see 541e6a989cae.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D43734

(cherry picked from commit 45eae45d91cb308396e15d6dabc764fc4c701f9f)
DeltaFile
+2-2tests/sys/kern/unix_passfd_test.c
+2-21 files

FreeBSD/src 1d57423 — secure/libexec Makefile, secure/libexec/ssh-sk-helper Makefile

Only build secure/libexec/ssh-sk-helper if MK_USB == no

The ssh-sk-helper utility only functions if/when MK_USB == yes.
Installing it on systems where MK_USB == no doesn't make sense.

Differential Revision:  https://reviews.freebsd.org/D58246

(cherry picked from commit 4db3872aabc33088cf180599c5eaa23b6f58e6d1)
DeltaFile
+1-4secure/libexec/ssh-sk-helper/Makefile
+3-1secure/libexec/Makefile
+2-0tools/build/mk/OptionalObsoleteFiles.inc
+6-53 files

FreeBSD/src 509d1a9 — secure/libexec Makefile, secure/libexec/ssh-sk-helper Makefile

Only build secure/libexec/ssh-sk-helper if MK_USB == no

The ssh-sk-helper utility only functions if/when MK_USB == yes.
Installing it on systems where MK_USB == no doesn't make sense.

Differential Revision:  https://reviews.freebsd.org/D58246

(cherry picked from commit 4db3872aabc33088cf180599c5eaa23b6f58e6d1)
DeltaFile
+1-4secure/libexec/ssh-sk-helper/Makefile
+3-1secure/libexec/Makefile
+2-0tools/build/mk/OptionalObsoleteFiles.inc
+6-53 files

FreeBSD/src 5c47571 — sbin/sysctl sysctl.8

jail.8: fix a typo, sort Xr

PR:             299990 (typo part)
MFC after:      1 week

(cherry picked from commit b9585475ee627e5ea0e17b9d2d2874faaf03a762)
DeltaFile
+3-3sbin/sysctl/sysctl.8
+3-31 files

FreeBSD/src 63302e9 — sys/fs/nfsclient nfs_clrpcops.c

nfs_clrpcops.c: Fix an mbuf leak introduced by fec497b89b1a

The calls to rpc_free_rdma_reduction() were removed, but I forgot
that newnfs_request() removes the reduction mbuf from the list
upon success, so it has to be free'd separately.
This patch does that.

The patch also disables reduction after the first loop interation.
This is necessary until nfsm_build_rdma_reduction() is patched
to handle an offset within the page array.

Reported by:    markj
MFC after:      1 month
Fixes:  884ee8d6c9b4 ("nfscl: Add some glue for client side NFS over RDMA")
DeltaFile
+38-19sys/fs/nfsclient/nfs_clrpcops.c
+38-191 files

FreeBSD/src 1a4c2ee — etc/mtree BSD.tests.dist, sys/fs/cd9660 cd9660_vfsops.c cd9660_rrip.c

cd9660: Fix dereferencing invalid RR outlen ptr

`ISO_RRIP_ANALYZE` is constructed in four places. Two of the
initializers set the `outlen` field while the other two,
`cd9660_rrip_analyze` and `cd9660_rrip_offset`, leave it uninitialized.

The uninitialized paths can dereference an invalid pointer on error
paths which causes a kernel panic.

To fix, I zero out `ISO_RRIP_ANALYZE` in all four places where it's
initialized and check that `outlen` is non-null on the error path
in `cd9660_rrip_loop`.

While testing the above, I encountered another kernel panic due to
mounting continuing after the error branch. Evidently, the ISO continued
mounting through the normal ISO 9660 path then triggered a panic down
the line due to a very broken file system from the ISO. To fix that, I
propagate the error from the RR path then fail in the mount path.


    [11 lines not shown]
DeltaFile
+226-0tests/sys/fs/cd9660/rrip_corrupt.c
+72-0tests/sys/fs/cd9660/cd9660_test.sh
+17-6sys/fs/cd9660/cd9660_rrip.c
+10-0tests/sys/fs/cd9660/Makefile
+6-3sys/fs/cd9660/cd9660_vfsops.c
+2-0etc/mtree/BSD.tests.dist
+333-92 files not shown
+335-108 files

FreeBSD/src ae33c4c — sys/conf files.arm64

acpi: build dev/acpi_support/acpi_wmi_if.m on ARM64

Per Wikipedia, ACPI WMI support is available on all x86* platforms
and ARM platforms. Add the source to `files.arm64` so code that relies
on its headers (thunderbolt(4) for instance), can be built on ARM64.

MFC after:      1 month
Reviewed By:    andrew
Differential Revision: https://reviews.freebsd.org/D55535

(cherry picked from commit 876d2b8392e6570a835a500d8fd7c4a5b0abf844)
DeltaFile
+1-0sys/conf/files.arm64
+1-01 files

FreeBSD/src 9242eb0 — contrib/libarchive FREEBSD-upgrade

libarchive: update documentation for suggested `git pull`

Replace git:// with https:// . The git:// protocol URL might not be
available, depending on firewall rules, as git:// is commonly blocked by
ISPs.

MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D50470

(cherry picked from commit 5c6ad1a2d175ec84e0e50621ce746c0d34fd5679)
DeltaFile
+1-1contrib/libarchive/FREEBSD-upgrade
+1-11 files

FreeBSD/src 377e0cf — usr.sbin/freebsd-update freebsd-update.sh

freebsd-update: sort options alphabetically

This helps future developers when adding additional options handlers in the
surrounding blocks.

This is effectively a no-op.

MFC after:      1 month

(cherry picked from commit 0adec3d7ec96105c402ff2286e402ad63c845066)
DeltaFile
+4-4usr.sbin/freebsd-update/freebsd-update.sh
+4-41 files

FreeBSD/src a97842b — . Makefile.inc1

Run `make obj` before running `make test-includes`

Before this change, `make test-includes` (run as part of buildworld)
would place test files in the current directory, which would clutter up
git clones. Run `make obj` beforehand to ensure that the files are put
in `${.OBJDIR}` instead of `${.CURDIR}`. This helps cut down on the
noise significantly when running commands like `git status`.

MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D55499

(cherry picked from commit 912864912b71951f9a636190b1dba80528f588eb)
DeltaFile
+2-1Makefile.inc1
+2-11 files

FreeBSD/src 85b9947 — libexec/tftpd/tests functional.c

tftpd tests: clean trailing whitespace

No functional change intended.

MFC after:      1 week

(cherry picked from commit fd6217075e6a5926bdc627145b38194b6c5ba8da)
DeltaFile
+9-9libexec/tftpd/tests/functional.c
+9-91 files

FreeBSD/src c452b66 — contrib/netbsd-tests/lib/libc/c063 t_fchmodat.c t_mkfifoat.c

contrib/netbsd-tests: lib/libc/c063: sync with NetBSD

This change syncs the lib/libc/c063 NetBSD tests with FreeBSD. This does
two things:
- Addresses bogus tautologically true assertions flagged by clang and gcc
  with ATF 0.22+ [1].
- Brings in some new test coverage.

Obtained from:  NetBSD (date tag: `20260818UTC`)
MFC after:      2 weeks
1. https://github.com/freebsd/atf/pull/72

(cherry picked from commit 8109a5c0fba0d015354a69b40e6682d5e8c0f638)
DeltaFile
+89-59contrib/netbsd-tests/lib/libc/c063/t_utimensat.c
+69-4contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
+29-2contrib/netbsd-tests/lib/libc/c063/t_mkfifoat.c
+11-6contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
+198-714 files