FreeBSD/src b307799tests/sys/file closefrom_test.c

closefrom_test: Fix the first test

The first test is supposed to close the new fd, but was instead not
closing anything.

Reviewed by:    ngie, markj
Fixes:          3cedbec3ee08 ("Integrate tools/regression/fifo into ...")
Differential Revision:  https://reviews.freebsd.org/D52799
DeltaFile
+4-4tests/sys/file/closefrom_test.c
+4-41 files

FreeBSD/src 8b29c37contrib/unbound configure aclocal.m4, contrib/unbound/testdata test_ldnsrr.c3

unbound: Vendor import 1.24.1

Release notes at
        https://nlnetlabs.nl/news/2025/Oct/22/unbound-1.24.1-released/

Security:       CVE-2025-11411
MFC after:      3 days

Merge commit '73dd92916f532cb3fe353220103babe576d30a15'
DeltaFile
+2,951-2,948contrib/unbound/configure
+2,600-2,592contrib/unbound/util/configlexer.c
+2,058-2,088contrib/unbound/util/configparser.c
+0-1,068contrib/unbound/testdata/test_ldnsrr.c3
+509-348contrib/unbound/aclocal.m4
+0-681contrib/unbound/testdata/stat_values.tdir/stat_values.test
+8,118-9,725136 files not shown
+8,317-25,092142 files

FreeBSD/src 73dd929. ltmain.sh configure, testdata iter_scrub_promiscuous.rpl

unbound: Vendor import 1.24.0

Release notes at
        https://nlnetlabs.nl/news/2025/Oct/22/unbound-1.24.1-released/

Security:       CVE-2025-11411
DeltaFile
+2,600-2,592util/configlexer.c
+2,058-2,088util/configparser.c
+969-601ltmain.sh
+1,129-366configure
+509-348aclocal.m4
+373-0testdata/iter_scrub_promiscuous.rpl
+7,638-5,995160 files not shown
+7,983-6,097166 files

FreeBSD/src 8691e93sys/modules/allwinner/aw_sid Makefile, sys/modules/allwinner/aw_thermal Makefile

modules/allwinner: add nvmem_if.h to SRCS

Ensure the header is generated; it is a dependency for these drivers.
This fixes standalone module builds and riscv LINT.

Reported by:    zlei
Sponsored by:   The FreeBSD Foundation
Fixes:  5522519731b7 ("modules: enable allwinner kmods on riscv")

(cherry picked from commit fe7954d723f85abd6eaf035db92a3a60a7803eb4)
DeltaFile
+2-1sys/modules/allwinner/aw_thermal/Makefile
+2-1sys/modules/allwinner/aw_sid/Makefile
+4-22 files

FreeBSD/src 898aea3sys/arm/conf NOTES GENERIC, sys/modules Makefile

arm: tweak imx module build logic

Add the subdirectory in the Makefile, not the config.

No functional change intended.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 5aefe9f16f240696142894bdeabcebbb057c7053)
DeltaFile
+5-0sys/modules/Makefile
+0-4sys/arm/conf/NOTES
+0-3sys/arm/conf/GENERIC
+5-73 files

FreeBSD/src 7b5e4e5sys/arm/conf GENERIC NOTES, sys/modules Makefile

modules: enable allwinner kmods on riscv

While here, standardize the place they are enabled in the Makefile. For
armv7 the module subdirectory was added explicitly in the config file,
but this is not idiomatic.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 5522519731b74e7b56c710ec5ea4d34065f3ed32)
DeltaFile
+1-1sys/modules/Makefile
+0-1sys/arm/conf/GENERIC
+0-1sys/arm/conf/NOTES
+1-33 files

FreeBSD/src 84ca93cshare/man/man4 aw_mmc.4

aw_mmc.4: add D1 compatible

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D52586

(cherry picked from commit 67bc0e34594d69acd14e5d08e426fdd26f5b7e5a)
DeltaFile
+3-1share/man/man4/aw_mmc.4
+3-11 files

FreeBSD/src cd7c8basys/modules Makefile

modules: fix some riscv module logic

The change which enabled the sdhci_fdt module build on riscv
inadvertently enabled the neta module as well. This driver is not needed
on this platform.

Move each entry to a respective identical conditional blocks.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Fixes:  e9dd9f95f82f ("riscv: Add the sdhci_fdt driver to the build")

(cherry picked from commit ddc1d4b0722bd63934f503c43a5ee35d871355ee)
DeltaFile
+3-9sys/modules/Makefile
+3-91 files

FreeBSD/src 58f613bshare/man/man4 aw_gpio.4 aw_sid.4, share/man/man4/man4.arm aw_gpio.4 aw_sid.4

man4: move allwinner pages and logic to a standard place

They are shared by arm, arm64, and now riscv. Note that they are
always installed by default, where MAN_ARCH=all.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D52585

(cherry picked from commit 15c79c6fa60809a9dc627e5051704cf2a556c6db)
DeltaFile
+0-102share/man/man4/man4.arm/aw_gpio.4
+102-0share/man/man4/aw_gpio.4
+79-0share/man/man4/aw_sid.4
+0-79share/man/man4/man4.arm/aw_sid.4
+73-0share/man/man4/aw_mmc.4
+0-73share/man/man4/man4.arm/aw_mmc.4
+254-2549 files not shown
+456-45615 files

FreeBSD/src 2257adbsys/modules/dtb/starfive Makefile, sys/riscv/conf std.starfive

riscv: build starfive JH7110 DTBs

These are known to work if loaded manually by loader(8) (for VF2 at
least). If nothing else, it is useful to provide a DTB closely tied to
the kernel version.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53117

(cherry picked from commit 96b137c044d8f7266757e95ff134119f3ac51be5)
DeltaFile
+7-0sys/modules/dtb/starfive/Makefile
+3-0sys/riscv/conf/std.starfive
+10-02 files

FreeBSD/src 0cc2448sys/conf dtb.build.mk

dtb: sort by vendor on riscv

Just like arm64, our DTS comes from Linux and is correctly sorted into
subdirectories by vendor. Enable the logic to preserve these directories
in the installation, for example:

  /boot/dtb/sifive/hifive-unmatched-a00.dtb

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53116

(cherry picked from commit cf202819af2337c0b652ac9290964c2ef7a1ae3c)
DeltaFile
+5-4sys/conf/dtb.build.mk
+5-41 files

FreeBSD/src 9a44b56sys/modules/dtb/allwinner Makefile, sys/riscv/conf std.allwinner

riscv: build allwinner DTBs

These are known to work if loaded manually by loader(8) (for the Nezha
board at least). If nothing else, it is useful to provide a DTB closely
tied to the kernel version.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53118

(cherry picked from commit 3ed48eb085f7c4ae5c019ee882e694b432d43911)
DeltaFile
+6-1sys/modules/dtb/allwinner/Makefile
+3-0sys/riscv/conf/std.allwinner
+9-12 files

FreeBSD/src 93b02f6sys/dev/random/fenestrasX fx_pool.c

random: fenestrasX: Add missing entropy sources

Reviewed by: cem
Fixes: 1492c8c0d qcom_rnd: add initial qualcomm prng driver.
Fixes: 9eecef052 Add an Armv8 rndr random number provider
Fixes: b2f8b2dc8 sys: Add an SMCCC Random Number Generator driver
Differential Revision:  https://reviews.freebsd.org/D53292
DeltaFile
+9-0sys/dev/random/fenestrasX/fx_pool.c
+9-01 files

FreeBSD/src 38e9d28sys/dev/random/fenestrasX fx_pool.c

random: fenestrasX: add RDSEED support

Reviewed by: cem
Fixes: 3a1298 random: add RDSEED as a provably unique entropy source
Differential Revision:  https://reviews.freebsd.org/D53291
DeltaFile
+3-0sys/dev/random/fenestrasX/fx_pool.c
+3-01 files

FreeBSD/src 7f42fc0. UPDATING

UPDATING: Belatedly note OpenZFS sysctls moving

Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52665

(cherry picked from commit 9f85cf09d48bb1bebeddab0913fc9ab2735cb810)
DeltaFile
+12-0UPDATING
+12-01 files

FreeBSD/src 6d408actests/sys/fs/fusefs bmap.cc

fusefs: add a regression test for a cluster_read bug

VOP_BMAP is purely advisory.  If VOP_BMAP returns an error during
readahead, cluster_read should still succeed, because the actual data
was still read just fine.

Add a regression test for PR 264196, wherein cluster_read would fail if
VOP_BMAP did.

PR:             264196
MFC with:       62aef3f73f38db9fb68bffc12cc8900fecd58f0e
Reported by:    danfe
Reviewed by:    arrowd
Differential Revision: https://reviews.freebsd.org/D51316
DeltaFile
+87-0tests/sys/fs/fusefs/bmap.cc
+87-01 files

FreeBSD/src f56da8f. ObsoleteFiles.inc, libexec/dma/dmagent Makefile

dma: Don't install dma.conf world-readable

While here, install auth.conf into /etc as well.

MFC after:      3 days
PR:             288409
Reviewed by:    ivy, bapt
Differential Revision:  https://reviews.freebsd.org/D51529

(cherry picked from commit a3d4ae7cf351cc283a670d8400a89518a6b31d63)
DeltaFile
+4-2libexec/dma/dmagent/Makefile
+3-0ObsoleteFiles.inc
+1-1tools/build/mk/OptionalObsoleteFiles.inc
+8-33 files

FreeBSD/src 218b164sys/netinet udp_usrreq.c

UDP: let udp_pcblist() support UDP and UDP-Lite

Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use
this to determine the inpcbinfo. This allows the same function to be
used in an upcoming commit to provide the list of pcbs for UDP-Lite
just by providing IPPROTO_UDPLITE in the arg2 parameter.

Reviewed by:            rrs
Differential Revision:  https://reviews.freebsd.org/D53218

(cherry picked from commit be3c59ff508204dbab9e3616dc82ed7620f05d0c)
DeltaFile
+8-7sys/netinet/udp_usrreq.c
+8-71 files

FreeBSD/src 6626f4esys/netinet tcp_syncache.c

tcp: cleanup of syncache_expand()

* Consistently free the string after unlocking the sch, if possible.
* Remove the failure handling in case of sc != NULL, since this is
  not possible anymore.
* Remove the use of goto and instead return 0 in the three cases.
The only change in behavior is that in three out of the four cases,
where 0 is returned, *lsop is not set to NULL anymore. So the behavior
is now consistent and also documented in a comment. The current in
tree callers only look at *lsop, if and only if syncache_expand()
returns 1.

Reviewed by:            Peter Lei
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D52948

(cherry picked from commit aafdbf83b926519cb47de8f16a1a40c1ef3c84b5)
DeltaFile
+15-18sys/netinet/tcp_syncache.c
+15-181 files

FreeBSD/src 3653781sys/netinet udp_usrreq.c

UDP: let udp_pcblist() support UDP and UDP-Lite

Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use
this to determine the inpcbinfo. This allows the same function to be
used in an upcoming commit to provide the list of pcbs for UDP-Lite
just by providing IPPROTO_UDPLITE in the arg2 parameter.

Reviewed by:            rrs
Differential Revision:  https://reviews.freebsd.org/D53218

(cherry picked from commit be3c59ff508204dbab9e3616dc82ed7620f05d0c)
DeltaFile
+8-7sys/netinet/udp_usrreq.c
+8-71 files

FreeBSD/src 8c19787usr.bin/sockstat main.c

sockstat: fix column length for PROTO

The computation of the length was not taking into account that IPv6
endpoints, which are not IPv6 only, have a suffix of 46.
For UDP and TCP this bug was not relevant, since tcp46 and udp46
has the same length as PROTO, but sctp46 is longer. Upcoming
udplite support will also be affected.

Reviewed by:            asomers
Differential Revision:  https://reviews.freebsd.org/D53212

(cherry picked from commit 4ee0ddae1dab05dd8e3f273d861043c3e2919f23)
DeltaFile
+3-1usr.bin/sockstat/main.c
+3-11 files

FreeBSD/src 9899843sys/netinet tcp_syncache.c

tcp: cleanup of syncache_expand()

* Consistently free the string after unlocking the sch, if possible.
* Remove the failure handling in case of sc != NULL, since this is
  not possible anymore.
* Remove the use of goto and instead return 0 in the three cases.
The only change in behavior is that in three out of the four cases,
where 0 is returned, *lsop is not set to NULL anymore. So the behavior
is now consistent and also documented in a comment. The current in
tree callers only look at *lsop, if and only if syncache_expand()
returns 1.

Reviewed by:            Peter Lei
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D52948

(cherry picked from commit aafdbf83b926519cb47de8f16a1a40c1ef3c84b5)
DeltaFile
+15-18sys/netinet/tcp_syncache.c
+15-181 files

FreeBSD/src f4f638esys/arm64/include armreg.h

arm64: Add additional fields for PMBSR and PMSIDR

Reviewed by:    andrew
Sponsored by:   Arm Ltd
DeltaFile
+14-0sys/arm64/include/armreg.h
+14-01 files

FreeBSD/src 8277897share/mk src.libnames.mk

share/mk: Add opencsd to the list of private libs

Reported by:    Sarah Walker <Sarah.Walker2 at arm.com>
Reviewed by:    emaste
Fixes:  1c52229528e7 ("lib: Move libopencsd to /usr/lib and make private")
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D53217
DeltaFile
+1-0share/mk/src.libnames.mk
+1-01 files

FreeBSD/src b157c28sys/arm64/conf std.arm, sys/modules/dtb/arm Makefile

modules/dtb: Add the ARM dtb module

fvp-base-revc.dtb works with the kernel now interrupt-maps are
supported in more cases.

Reviewed by:    mhorne
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D51258
DeltaFile
+6-0sys/modules/dtb/arm/Makefile
+3-0sys/arm64/conf/std.arm
+9-02 files

FreeBSD/src 4d57895usr.bin/w w.c

w: Trim whitespace and commas from time and uptime

When producing formatted output, trim leading whitespace and trailing
commas from the human-readable time and uptime before emitting them.
The text output remains unchanged.

PR:             290089
Fixes:          6e6febb54da9 ("w: Fix idle time in json output, add login/idle times to json output")
Reviewed by:    marius.h_lden.org
Differential Revision:  https://reviews.freebsd.org/D53167
DeltaFile
+25-8usr.bin/w/w.c
+25-81 files

FreeBSD/src bfda98asys/netinet tcp_subr.c

tcp over udp: don't copy more bytes than avaiable

When copying the data in the first mbuf to get rid of the UDP
header, use the correct length. It was copying too much (8 bytes,
the length of the UDP header).
This only applies to handling TCP over UDP packets. The support for
TCP over UDP is disabled by default.

Reported by:            jtl
Reviewed by:            Peter Lei
MFC after:              3 days
Sponsored by:           Netflix, Inc.
DeltaFile
+1-1sys/netinet/tcp_subr.c
+1-11 files

FreeBSD/src c2b08c1usr.bin/netstat inet.c main.c

netstat: add support for UDP-Lite endpoints

With this patch UDP-Lite endpoints are also shown per default.

Reviewed by:            Nick Banks
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D53252
DeltaFile
+26-11usr.bin/netstat/inet.c
+4-0usr.bin/netstat/main.c
+30-112 files

FreeBSD/src f48c639usr.bin/sockstat main.c

sockstat: add support for UDP-Lite endpoints

With this patch UDP-Lite endpoints are also show per default.

Reviewed by:            Peter Lei, Nick Banks
MFC after:              3 days
Relnotes:               yes
Differential Revision:  https://reviews.freebsd.org/D53230
DeltaFile
+7-1usr.bin/sockstat/main.c
+7-11 files

FreeBSD/src be93b27sys/netinet udp_usrreq.c in_proto.c

UDP-Lite: export pcblist via sysctl interface

Export the list of pcbs for UDP-Lite to be consumed by sockstat and
netstat.

Reviewed by:            Peter Lei, Nick Banks
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D53229
DeltaFile
+5-0sys/netinet/udp_usrreq.c
+2-0sys/netinet/in_proto.c
+1-0sys/netinet/udp_var.h
+8-03 files