FreeBSD/src 17494c6. Makefile.inc1, share/man/man5 src.conf.5

build: Boostrap LLVM_BINUTILS for cross-tools

Reported by:    vexeduxr, jrtc27
Reviewed by:    imp
Sponsored by:   The FreeBSD Foundation
Pull request:   https://github.com/freebsd/freebsd-src/pull/2084
Differential Revision: https://reviews.freebsd.org/D55923
DeltaFile
+17-2Makefile.inc1
+13-0share/man/man5/src.conf.5
+12-0tools/build/options/WITHOUT_LLVM_BINUTILS_BOOTSTRAP
+1-0share/mk/src.opts.mk
+43-24 files

FreeBSD/src 9f8db9csys/compat/linux linux_misc.c

compat/linux: Avoid waitid() kernel stack disclosure

Reported by:    Adam Crosser, Praetorian
Reviewed by:    philip
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55812

(cherry picked from commit 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd)
DeltaFile
+1-0sys/compat/linux/linux_misc.c
+1-01 files

FreeBSD/src 4551ea3sys/compat/freebsd32 freebsd32_misc.c

compat32: Zero struct to avoid stack disclosure

Reported by:    Adam Crosser, Praetorian
Reviewed by:    philip
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55811

(cherry picked from commit 097cb4e9f0432c543c704cec712ce1cd3302335c)
DeltaFile
+1-1sys/compat/freebsd32/freebsd32_misc.c
+1-11 files

FreeBSD/src 6348a5fsys/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

(cherry picked from commit 25cc459286a02b646751541ccde5a33319471c73)
DeltaFile
+1-1sys/kern/uipc_shm.c
+1-11 files

FreeBSD/src dc2687bshare/man/man5 src.conf.5

src.conf(5): rebuild after introduction of WITHOUT_PKGSERVE
DeltaFile
+4-1share/man/man5/src.conf.5
+4-11 files

FreeBSD/src b42e852libexec/pkg-serve pkg-serve.c pkg-serve.8, libexec/pkg-serve/tests pkg_serve_test.sh Makefile

pkg-serve(8): serve pkg repositories over TCP via inetd (8)

Reviewed by:    manu, bdrewery (previous version)
Differential Revision:  https://reviews.freebsd.org/D55895
DeltaFile
+230-0libexec/pkg-serve/tests/pkg_serve_test.sh
+180-0libexec/pkg-serve/pkg-serve.c
+107-0libexec/pkg-serve/pkg-serve.8
+9-0libexec/pkg-serve/Makefile
+5-0tools/build/mk/OptionalObsoleteFiles.inc
+5-0libexec/pkg-serve/tests/Makefile
+536-04 files not shown
+545-010 files

FreeBSD/src a0170dbsbin/recoverdisk recoverdisk.c

"Pending" is more correct than "Missing"

Pointed out by: Alex "the PS/2 guy"
DeltaFile
+1-1sbin/recoverdisk/recoverdisk.c
+1-11 files

FreeBSD/src 2265cf9sys/net if.c

ifnet: Fix decreasing the vnet interface count

It should be decreased only when the interface has been successfully
removed from the "active" list.

This prevents vnet_if_return() from potential OOB writes to the
allocated memory "pending".

Reviewed by:    kp, pouria
Fixes:          a779388f8bb3 if: Protect V_ifnet in vnet_if_return()
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55873

(cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7)
(cherry picked from commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02)
(cherry picked from commit 47339e4a9209c1d1323f58d792e277792990e060)
DeltaFile
+3-3sys/net/if.c
+3-31 files

FreeBSD/src 47339e4sys/net if.c

ifnet: Fix decreasing the vnet interface count

It should be decreased only when the interface has been successfully
removed from the "active" list.

This prevents vnet_if_return() from potential OOB writes to the
allocated memory "pending".

Reviewed by:    kp, pouria
Fixes:          a779388f8bb3 if: Protect V_ifnet in vnet_if_return()
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55873

(cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7)
(cherry picked from commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02)
DeltaFile
+3-3sys/net/if.c
+3-31 files

FreeBSD/src fa5f0d9sys/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

(cherry picked from commit 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f)
(cherry picked from commit f521487cd935a0a547a9d7b54eeadebb200f5148)
DeltaFile
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+2-22 files

FreeBSD/src 1b7687fsys/net if.c

ifnet: Fix decreasing the vnet interface count

It should be decreased only when the interface has been successfully
removed from the "active" list.

This prevents vnet_if_return() from potential OOB writes to the
allocated memory "pending".

Reviewed by:    kp, pouria
Fixes:          a779388f8bb3 if: Protect V_ifnet in vnet_if_return()
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55873

(cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7)
DeltaFile
+3-3sys/net/if.c
+3-31 files

FreeBSD/src f521487sys/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

(cherry picked from commit 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f)
DeltaFile
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+2-22 files

FreeBSD/src 33345b8sys/kern sys_timerfd.c

timerfd: Suppress kqueue readability after jump read

Do not report EVFILT_READ after reading a discontinuous clock jump.
This makes the kqueue filter consistent with Linux epoll behavior
and timerfd_poll(), which already checks tfd_jumped != TFD_READ before
reporting POLLIN.

MFC after: 2 weeks
DeltaFile
+1-1sys/kern/sys_timerfd.c
+1-11 files

FreeBSD/src b11fba4sys/kern sys_timerfd.c

timerfd: Wake up on discontinuous jump

If a discontinous realtime clock change occurs and sets any TFD_JUMPED
bits on the timerfd, then wake up waiting readers. This fixes failures
from the timerfd_root__clock_change_notification test case.

MFC after: 2 weeks
DeltaFile
+11-3sys/kern/sys_timerfd.c
+11-31 files

FreeBSD/src e379953sys/sys time.h

sys/time: Add saturating sbt conversions

When converting from timespec to sbintime, the timespec's 64-bit tv_sec
component is shifted to the left 32 bits, causing any information in the
upper 32 bits to be lost.

This data loss during conversion can turn timespecs with very large
tv_sec counters into sbintimes that represent much smaller time
durations.

Add tstosbt_sat() and tvtosbt_sat(), which are saturating versions of
tstosbt and tvtosbt. With these routines, any overflow resulting from
the conversion is clamped to [-SBT_MAX - 1, SBT_MAX].

Reviewed by:            imp, markj
Differential Revision:  https://reviews.freebsd.org/D55791
MFC after:              2 weeks
DeltaFile
+21-0sys/sys/time.h
+21-01 files

FreeBSD/src 834c1batests/sys/kern timerfd.c Makefile

timerfd: Add tests

Take Jan Kokemuller's timerfd tests from the epoll-shim project,
stripping out code that isn't directly related to FreeBSD.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D55789
MFC after:              2 weeks
DeltaFile
+1,318-0tests/sys/kern/timerfd.c
+3-0tests/sys/kern/Makefile
+1,321-02 files

FreeBSD/src 0e8f351sys/kern sys_timerfd.c

timerfd: Use saturating sbintime conversions

Some timerfd consumers set expirations with timespec tv_sec components
larger than 2^31 - 1. In such cases, converting that timespec to
sbintime results in data loss or sign flip, yielding a shorter
expiration than desired.

To avoid this problem, use saturating timespec-to-sbintime conversion
functions. These will clamp the converted sbintime to SBT_MAX under
circumstances where the normal conversion functions would overflow.

Saturating conversions still result in data loss, but the consequences
are less severe, causing problems only after SBT_MAX (~68 years) of
system uptime elapses.

Reviewed by:            imp
Differential Revision:  https://reviews.freebsd.org/D55792
MFC after:              2 weeks
DeltaFile
+5-5sys/kern/sys_timerfd.c
+5-51 files

FreeBSD/src 85c0f1asys/kern sys_timerfd.c, tests/sys/kern timerfd.c

timerfd: Fix interval callout scheduling

When a timerfd interval callout misses its scheduled activation time, a
differential is calculated based on the actual activation time and the
scheduled activation time. This differential is divided by the timerfd's
interval time and the quotient is added to the timerfd's counter.

Before this change, the next callout was scheduled to activate at:
scheduled activation time + timerfd interval.

This change fixes the scheduling of the next callout to activate at:
actual activation time + timerfd interval - remainder.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D55790
MFC after:              2 weeks
DeltaFile
+29-0tests/sys/kern/timerfd.c
+13-11sys/kern/sys_timerfd.c
+42-112 files

FreeBSD/src 2eb0a88cddl/contrib/opensolaris/cmd/dtrace dtrace.1

dtrace.1: Reference dtrace_cam.4

Fixes:  1a7151f79664 cam: Add probes for xpt actions
Event:  AsiaBSDCon 2026
DeltaFile
+2-1cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+2-11 files

FreeBSD/src 14b9955secure/lib/libcrypto/modules Makefile.inc

libcrypto: compile all PIC objects with -DOPENSSL_PIC

This change modifies the libcrypto PIC objects to always compile with
`-DOPENSSL_PIC` to restore parity with the upstream build process. This
ensures that `-DOPENSSL_PIC` is used whenever building the auxiliary
shared objects. In this case, just the legacy provider (we no longer
distribute the fips provider).

MFC after:              2 weeks
Differential Revision:  https://reviews.freebsd.org/D44896
DeltaFile
+2-0secure/lib/libcrypto/modules/Makefile.inc
+2-01 files

FreeBSD/src f979561sys/modules/ath11k Makefile

ath11k: restore module Makefile

During the subtree merge and checking out the updated version of ath12k
parts of the previous ath11k merge were accidentally undone.
Retore the ath11k Makefile as well after 3c4eef5d838b restored the
driver bits.

Fixes:          a96550206e4b ("ath12k: update Atheros/QCA's ath12k ..")
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+43-20sys/modules/ath11k/Makefile
+43-201 files

FreeBSD/src 3c4eef5sys/contrib/dev/athk/ath11k mac.c pci.c

ath11k: reduce diff to upstream Atheros/QCA's ath11k driver

It seems that over the time of merging and only partly working
on making it compile again a few mis-merges happened.
Reduce diff to the v6.19 upstream version so that we only have
additions to the driver (usually guarded by #ifdef __FreeBSD__).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+316-139sys/contrib/dev/athk/ath11k/mac.c
+52-4sys/contrib/dev/athk/ath11k/pci.c
+19-19sys/contrib/dev/athk/ath11k/hal.h
+15-7sys/contrib/dev/athk/ath11k/wmi.c
+9-9sys/contrib/dev/athk/ath11k/pci.h
+3-15sys/contrib/dev/athk/ath11k/wmi.h
+414-1931 files not shown
+415-1947 files

FreeBSD/src 03ba27csys/modules/ath12k Makefile

ath12k: update module Makefile after vendor import of v6.19

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+32-6sys/modules/ath12k/Makefile
+32-61 files

FreeBSD/src a965502sys/contrib/dev/athk/ath12k mac.c debugfs_htt_stats.c

ath12k: update Atheros/QCA's ath12k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
05f7e89ab9731565d8a62e3b5d1ec206485eeb0b ( tag: v6.19 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+9,336-1,825sys/contrib/dev/athk/ath12k/mac.c
+6,178-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.c
+4,684-353sys/contrib/dev/athk/ath12k/wmi.c
+2,346-505sys/contrib/dev/athk/ath12k/dp_mon.c
+2,076-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.h
+1,814-206sys/contrib/dev/athk/ath12k/wmi.h
+26,434-2,88965 files not shown
+42,804-5,61571 files

FreeBSD/src 09cacabsys/modules/ath11k Makefile

ath11k: update module Makefile after vendor import of v6.19[-rc6]

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+43-20sys/modules/ath11k/Makefile
+43-201 files

FreeBSD/src 187d8a3sys/contrib/dev/athk/ath11k mac.c hal.h

ath11k: update Atheros/QCA's ath11k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+316-139sys/contrib/dev/athk/ath11k/mac.c
+19-19sys/contrib/dev/athk/ath11k/hal.h
+13-7sys/contrib/dev/athk/ath11k/wmi.c
+19-1sys/contrib/dev/athk/ath11k/pci.c
+9-9sys/contrib/dev/athk/ath11k/pci.h
+3-15sys/contrib/dev/athk/ath11k/wmi.h
+379-1901 files not shown
+380-1917 files

FreeBSD/src 80aae8asys/contrib/openzfs/cmd/zdb zdb.c, sys/contrib/openzfs/config toolchain-simd.m4

zfs: merge openzfs/zfs at 3ee08abd2

Notable upstream pull request merges:
 #17000 -multiple cmd/zfs: support creating parents with canmount=no
 #17926 b481a8bbb Make zpool status dedup table support raw bytes -p output
 #18238 -multiple Report space metrics per allocation class
 #18240 5dad9459d Add --no-preserve-encryption flag
 #18257 1eace5906 libzfs: use mount_setattr for selective remount including
                  legacy mounts
 #18259 1e2c94a04 More consistent use of TREE_* macros in AVL comparators
 #18262 c58b8b7dc Fix check for .cfi_negate_ra_state on aarch64
 #18264 f109c7bb9 Add the --file-layout (-f) option to zdb(8)
 #18268 304de7f19 libzfs: handle EDOM error in zpool_create
 #18275 753f1e1e2 zstream: add a drop_record subcommand
 #18276 0f90a797d Fix vdev_rebuild_range() tx commit
 #18277 1e1d64d66 Fix log vdev removal issues
 #18278 06b0abfe6 Fix the send --exclude option to work with encryption
 #18281 e73ada771 libzpool: lift zfs_file ops out to separate source file
 #18284 d97945776 zstream: consolidate shared code

    [19 lines not shown]
DeltaFile
+73-565sys/contrib/openzfs/config/toolchain-simd.m4
+421-148sys/contrib/openzfs/lib/libzfs/libzfs.abi
+420-0sys/contrib/openzfs/lib/libzpool/zfs_file_os.c
+416-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_006_pos.ksh
+0-388sys/contrib/openzfs/lib/libzpool/kernel.c
+362-21sys/contrib/openzfs/cmd/zdb/zdb.c
+1,692-1,122176 files not shown
+6,025-2,882182 files

FreeBSD/src 56dddebsys/netinet6 ip6_input.c

ip6_input: Remove unused check for IPv4-compatible IPv6

IPv4-compatible IPv6 addresses are deprecated by RFC 4291.
No functional change intended.

Reviewed by: glebius, emaste
Differential Revision: https://reviews.freebsd.org/D55387
DeltaFile
+0-15sys/netinet6/ip6_input.c
+0-151 files

FreeBSD/src 17920f8sys/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
DeltaFile
+0-5sys/net/if_bridge.c
+0-51 files

FreeBSD/src 1c1b494share/man/man9 ecn.9

ecn.9: Replace non-ASCII characters

Reported by:    maxim
Fixes:          ba4298b05564 ("ecn.9: Add ecn(9) manual")
DeltaFile
+3-3share/man/man9/ecn.9
+3-31 files