FreeBSD/src 30394f3lib/libsys clock_gettime.2

clock_gettime(2): Remove unneeded trailing wording.
DeltaFile
+1-2lib/libsys/clock_gettime.2
+1-21 files

FreeBSD/src ab4abcebin/pwait pwait.c

pwait: Avoid calling getpid(2) for each proc.
DeltaFile
+3-1bin/pwait/pwait.c
+3-11 files

FreeBSD/src 35f3755usr.bin/cut cut.c

cut: Avoid undefined behavior.

Summary: UBSAN complains about p[signed - unsigned] wrapping around.

Reviewed by:    kevans
Differential Revision: https://reviews.freebsd.org/D53226
DeltaFile
+2-2usr.bin/cut/cut.c
+2-21 files

FreeBSD/src 0fc5b40sys/conf newvers.sh

15.0: Update to BETA3

Approved by:    re (implicit)
Sponsored by:   https://www.patreon.com/cperciva
DeltaFile
+1-1sys/conf/newvers.sh
+1-11 files

FreeBSD/src a653824release/packages/ucl caroot.ucl

packages: Update the METALOG when (un)installing the caroot package

There may be other issues here but this change certainly seems to
be necessary.

Approved by:    re (cperciva)
PR:     290394
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D53263

(cherry picked from commit fa240b7ff081a49d44e0941b2090e5dc5838fe60)
(cherry picked from commit 8b4585444728ca241d09cd230a3b8e27e3954847)
DeltaFile
+2-2release/packages/ucl/caroot.ucl
+2-21 files

FreeBSD/src 8b45854release/packages/ucl caroot.ucl

packages: Update the METALOG when (un)installing the caroot package

There may be other issues here but this change certainly seems to
be necessary.

PR:     290394
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D53263

(cherry picked from commit fa240b7ff081a49d44e0941b2090e5dc5838fe60)
DeltaFile
+2-2release/packages/ucl/caroot.ucl
+2-21 files

FreeBSD/src a4eedfcsys/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.

Approved by:    re (cperciva)
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53117

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

FreeBSD/src f2c15acsys/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.

Approved by:    re (cperciva)
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53118

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

FreeBSD/src 24718d1sys/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

Approved by:    re (cperciva)
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53116

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

FreeBSD/src 369ef36usr.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.

Approved by:    re (cperciva)
Reviewed by:            asomers
Differential Revision:  https://reviews.freebsd.org/D53212

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

FreeBSD/src 2c40d6e. UPDATING, sys/sys param.h

UPDATING: bump __FreeBSD_version for LinuxKPI changes

The size of an embedded struct has changed and might possibly be a
problem.  Allow this change to be detected by bumping __FreeBSD_version.

Approved by:    re (cperciva)

(cherry picked from commit 37ad1beaf516854d5e59b90a9706b09d02cc2a81)
(cherry picked from commit a4ee95e54ad1e6a00be4dbaf9c3476915c212918)
DeltaFile
+4-0UPDATING
+1-1sys/sys/param.h
+5-12 files

FreeBSD/src 3435388sys/compat/linuxkpi/common/include/linux nl80211.h ieee80211.h, sys/compat/linuxkpi/common/include/net cfg80211.h mac80211.h

LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers

This includes some type cleanups as well as some shuffling of structs
and functions to sort dependencies out.  Few new functions and defines
as well as new struct members.  Minor fixes to style and debug logging.

This is the majority of changes.  None of these should conflict with
current in-tree drivers.  The final bit of changes will come along with
the driver updates adding an extra argument to function pointers.

Approved by:    re (cperciva)

(cherry picked from commit 0567484734ad9732978e189ebed042f6320e2471)
(cherry picked from commit f2b2d6c18a57abbedb14bf439ed5c69d648c47b6)
DeltaFile
+210-110sys/compat/linuxkpi/common/include/net/cfg80211.h
+13-24sys/compat/linuxkpi/common/include/net/mac80211.h
+11-1sys/compat/linuxkpi/common/src/linux_80211.c
+10-0sys/compat/linuxkpi/common/include/linux/nl80211.h
+1-1sys/compat/linuxkpi/common/src/linux_80211_macops.c
+2-0sys/compat/linuxkpi/common/include/linux/ieee80211.h
+247-1366 files

FreeBSD/src 70d9247sys/compat/linuxkpi/common/include/linux netdevice.h

LinuxKPI: netdevice add attach/detach skeleton functions

For the moment add skeleton functions for netif_device_attach/detach()
needed by rtw8[89] v6.17.

Approved by:    re (cperciva)

(cherry picked from commit 5ea941a4fbfd1ba2483e47fe30ed6713fe912284)
(cherry picked from commit 4bdd0e51d7113aadcbfba9a76d72d8e924c5dcdf)
DeltaFile
+15-0sys/compat/linuxkpi/common/include/linux/netdevice.h
+15-01 files

FreeBSD/src f6fe2cfsys/compat/linuxkpi/common/include/linux skbuff.h

LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now

This likely belongs in socket code which we do not have in LinuxKPI.
Needed by a wirless driver at v6.17.

Approved by:    re (cperciva)

(cherry picked from commit 88dbf83345feefa7181bd6df47786e1a8d1d304d)
(cherry picked from commit 3ad05fa24a240011a8252140ff6431cb0b7879d9)
DeltaFile
+3-0sys/compat/linuxkpi/common/include/linux/skbuff.h
+3-01 files

FreeBSD/src 6457853sys/compat/linuxkpi/common/include/linux/soc/mediatek mtk_wed.h

LinuxKPI: soc/mediatek add pr_debug calls

We do not support Wireless Ethernet Dispatch (wed) on the mt76 (yet).
Add pr_debug calls with TODO in case we run into the calls anyway so
we could deal with them.

Approved by:    re (cperciva)

(cherry picked from commit 224ac9d2a030f85924e44a507ddc412797c3fe87)
(cherry picked from commit b9b571e6146a1b95ba18de065166a1a50eb88dfc)
DeltaFile
+15-32sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h
+15-321 files

FreeBSD/src 4a2f779sys/compat/linuxkpi/common/include/net page_pool.h netmem.h, sys/compat/linuxkpi/common/include/net/page_pool helpers.h types.h

LinuxKPI: page_pool headers moved; add netmem.h

page_pool headers were not used yet;  they were created for mt76 but
are without functionality.  Upstream has migrated them for v6.17 and
split them up into multiple files.  Also add netmem.h which the little
needed is directly related to page pools.

Approved by:    re (cperciva)

(cherry picked from commit 7c31cdfa408a4ebce7a3e10d29056a15c28bc092)
(cherry picked from commit d388ff8016adf0f24b9b846941f1f15f5463c49e)
DeltaFile
+0-119sys/compat/linuxkpi/common/include/net/page_pool.h
+79-0sys/compat/linuxkpi/common/include/net/page_pool/helpers.h
+36-0sys/compat/linuxkpi/common/include/net/page_pool/types.h
+21-0sys/compat/linuxkpi/common/include/net/netmem.h
+136-1194 files

FreeBSD/src 18bb10csys/compat/linuxkpi/common/include/linux pci.h

LinuxKPI: add skeleton pci_enable_wake()

Given we do not yet support "wake" bits in device there is little need
doing it in PCI if we cannot check if we are supposed to do the
operation in first place.  Once we would implement this, we would need
to also do the appropriate PCI (pme) checks before enabling (disabling)
it.

Approved by:    re (cperciva)
Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D53208

(cherry picked from commit 885e8f272f7515b0325974de72d18b73318eff07)
(cherry picked from commit be52a81be07997f84f454637372a056415f6a2eb)
DeltaFile
+13-0sys/compat/linuxkpi/common/include/linux/pci.h
+13-01 files

FreeBSD/src 5440f67sys/compat/linuxkpi/common/include/linux fips.h

LinuxKPI: add fips.h

We do not currently aim to support crypto FIPS compliance in LinuxKPI
so keep this turned off.

Approved by:    re (cperciva)
Reviewed by:    emaste, dumbbell
Differential Revision: https://reviews.freebsd.org/D53207

(cherry picked from commit 98609f4fecffd0e70293ddd57c2b785e498b1131)
(cherry picked from commit 3aaaba20786966062d1355d4809142b623ffc4b7)
DeltaFile
+12-0sys/compat/linuxkpi/common/include/linux/fips.h
+12-01 files

FreeBSD/src 1a71288sys/compat/linuxkpi/common/include/linux device.h

LinuxKPI: device_driver add (*coredump)()

Needed by multiple wireless driver for the v6.17 update (likely earlier
versions already).

Approved by:    re (cperciva)
Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D53206

(cherry picked from commit 8ea366f40084010c14fe40b3aebb42b459b195cc)
(cherry picked from commit 0741aa3c7230f24472d915e44121c0b92d75c3a1)
DeltaFile
+1-0sys/compat/linuxkpi/common/include/linux/device.h
+1-01 files

FreeBSD/src b691171sys/compat/linuxkpi/common/include/linux platform_device.h

LinuxKPI: platform_device return type change

The return type now is void;  I believe no one ever used this
so we can just chnage it.  The only active platform_driver_register()
calls seems to be in ath1[01]k and mt76 and there in unsupported code.

Approved by:    re (cperciva)
Reviewed by:    dumbbell, emaste
Differential Revision: https://reviews.freebsd.org/D53205

(cherry picked from commit 0ae4998423e0d513fb88e404dfb1c2a285d11309)
(cherry picked from commit 5434a1635ed3fab8214f3fea8ada9772e4372372)
DeltaFile
+1-1sys/compat/linuxkpi/common/include/linux/platform_device.h
+1-11 files

FreeBSD/src 8c34b2esys/compat/linuxkpi/common/include/linux etherdevice.h

LinuxKPI: add three skeleton functions to etherdevice.h

We will see how much we will need them and how to fill them at that
point.  They are left with a pr_debug("TODO") for now.

Approved by:    re (cperciva)
Differential Revision: https://reviews.freebsd.org/D53204

(cherry picked from commit cc792250acadd29e80a69501ad326d1340c0c1c6)
(cherry picked from commit 805038b70a23f3f488ecba6e103f2aa1f9dad63c)
DeltaFile
+23-0sys/compat/linuxkpi/common/include/linux/etherdevice.h
+23-01 files

FreeBSD/src 257376bsys/compat/linuxkpi/common/include/linux compiler.h

LinuxKPI: add __counted_by_le() and __counted_by_be()

The former is needed by a wireless driver at v6.17.

Approved by:    re (cperciva)
Reviewed by:    dumbbell, emaste
Differential Revision: https://reviews.freebsd.org/D53203

(cherry picked from commit 0a4b11ddb298fa08e1a81af7337995a3769552bf)
(cherry picked from commit 0e30cab0f32ee40e89f59b3a287ae96c084e1e7a)
DeltaFile
+8-0sys/compat/linuxkpi/common/include/linux/compiler.h
+8-01 files

FreeBSD/src d1ca010sys/amd64/conf GENERIC, sys/conf files.i386 files.x86

padlock(4)/nehemiah: move i386-only entropy source to MD files

Reviewed by: khng
Differential Revision:  https://reviews.freebsd.org/D53309
DeltaFile
+7-0sys/i386/conf/NOTES
+3-1sys/modules/Makefile
+1-0sys/conf/files.i386
+0-1sys/amd64/conf/GENERIC
+0-1sys/x86/conf/NOTES
+0-1sys/conf/files.x86
+11-41 files not shown
+11-57 files

FreeBSD/src 0d589ecsys/netpfil/ipfilter/netinet ip_htable.c

ipfilter: Plug ip_htable kernel information leak

ipf_htable_stats_get() constructs an iphtstat_t on the stack and only
initializes select fields before copying the entire structure to
userland. The trailing padding array iphs_pad[16] is never initialized,
so ~128 bytes of uninitialized kernel stack memory can be leaked to user
space on each call. This is a classic information disclosure
vulnerability that can reveal pointers and other sensitive data.

We fix this by zeroing out the data structure prior to use.

Reported by:            Ilja Van Sprundel <ivansprundel at ioactive.com>
Reviewed by:            emaste
MFC after:              3 days
Differential revision:  https://reviews.freebsd.org/D53275
DeltaFile
+2-0sys/netpfil/ipfilter/netinet/ip_htable.c
+2-01 files

FreeBSD/src 6535e93sys/netpfil/ipfilter/netinet ip_nat.c

ipfilter: Plug ip_nat kernel information leak

ipf_nat_getent() allocates a variable-sized nat_save_t buffer with
KMALLOCS() (which does not zero memory) and then copies only a subset
of fields into it before returning the object to userland using
ipf_outobjsz(). Because the structure is not fully initialized on all
paths, uninitialized kernel heap bytes can be copied back to user space,
resulting in an information leak.

We fix this by zeroing out the data structure immediately after
allocation.

Reported by:            Ilja Van Sprundel <ivansprundel at ioactive.com>
Reviewed by:            emaste
MFC after:              3 days
Differential revision:  https://reviews.freebsd.org/D53274
DeltaFile
+1-0sys/netpfil/ipfilter/netinet/ip_nat.c
+1-01 files

FreeBSD/src bbe65c5release/tools vmimage.subr

release: Use PKG_CMD when installing pkgbase packages in vmimage.subr

This defaults to plain "pkg", but being able to override it is useful
when testing pkg itself.

Reviewed by:    cperciva
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53307
DeltaFile
+1-1release/tools/vmimage.subr
+1-11 files

FreeBSD/src 14b5330sys/contrib/dev/mediatek/mt76/mt7925 mcu.c main.c, sys/contrib/dev/mediatek/mt76/mt7996 main.c mcu.c

mt76: update Mediatek's mt76 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

MFC after:      3 days
DeltaFile
+769-267sys/contrib/dev/mediatek/mt76/mt7996/main.c
+577-332sys/contrib/dev/mediatek/mt76/mt7996/mcu.c
+366-156sys/contrib/dev/mediatek/mt76/mt7925/mcu.c
+303-189sys/contrib/dev/mediatek/mt76/mt7996/mac.c
+157-62sys/contrib/dev/mediatek/mt76/mt7925/main.c
+201-0sys/contrib/dev/mediatek/mt76/mt7925/testmode.c
+2,373-1,00675 files not shown
+3,983-1,86481 files

FreeBSD/src 76aed63sys/compat/linuxkpi/common/include/net mac80211.h, sys/compat/linuxkpi/common/src linux_80211_macops.c

LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers

This includes the conflicting changes from previous driver versions
(v6.11/v6.14), mostly being function pointer or function arguments.

MFC after:      3 days
DeltaFile
+7-7sys/compat/linuxkpi/common/include/net/mac80211.h
+8-4sys/compat/linuxkpi/common/src/linux_80211_macops.c
+15-112 files

FreeBSD/src 354a030sys/contrib/dev/rtw89 coex.c debug.c

rtw89: update Realtek's rtw89 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

MFC after:      3 days
DeltaFile
+2,439-1,575sys/contrib/dev/rtw89/coex.c
+1,298-926sys/contrib/dev/rtw89/debug.c
+1,296-166sys/contrib/dev/rtw89/fw.c
+811-406sys/contrib/dev/rtw89/phy.c
+1,117-25sys/contrib/dev/rtw89/acpi.c
+1,042-0sys/contrib/dev/rtw89/usb.c
+8,003-3,09857 files not shown
+14,290-5,09863 files

FreeBSD/src eb15fdbsys/contrib/dev/rtw88 rtw8814a_table.c rtw8814a.c

rtw88: update Realtek's rtw88 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

MFC after:      3 days
DeltaFile
+23,930-0sys/contrib/dev/rtw88/rtw8814a_table.c
+2,281-0sys/contrib/dev/rtw88/rtw8814a.c
+148-67sys/contrib/dev/rtw88/phy.c
+74-44sys/contrib/dev/rtw88/main.c
+64-5sys/contrib/dev/rtw88/reg.h
+67-1sys/contrib/dev/rtw88/rtw8723x.c
+26,564-11748 files not shown
+27,181-33254 files