HardenedBSD/src 5a251dcsys/contrib/openzfs/module/os/linux/spl spl-zone.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+499-10sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+343-80sys/contrib/openzfs/module/zfs/vdev_draid.c
+385-28sys/contrib/openzfs/module/os/linux/spl/spl-zone.c
+307-11sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+24-216sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+237-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/zoned_uid_common.kshlib
+1,795-345170 files not shown
+9,632-855176 files

HardenedBSD/src e26cb00sys/contrib/openzfs/module/os/linux/spl spl-zone.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+499-10sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+343-80sys/contrib/openzfs/module/zfs/vdev_draid.c
+385-28sys/contrib/openzfs/module/os/linux/spl/spl-zone.c
+307-11sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+24-216sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+237-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/zoned_uid_common.kshlib
+1,795-345170 files not shown
+9,632-855176 files

HardenedBSD/src c095e0dsys/dev/ixgbe if_ix.c ixgbe_sriov.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+1-1sys/dev/ixgbe/if_sriov.c
+4-43 files

HardenedBSD/src 554f5aausr.sbin/service service.sh

service(8): Replace indentation in usage()

The -d option was indented with spaces instead of tabs, and this broke
formatting.

Before:

-d                Enable debugging of rc.d scripts
-j              Perform actions within the named jail

After:

-d              Enable debugging of rc.d scripts
-j              Perform actions within the named jail

MFC after:      1 week
DeltaFile
+1-1usr.sbin/service/service.sh
+1-11 files

HardenedBSD/src fa3958csys/dev/ixgbe if_ix.c ixgbe_sriov.h

ixgbe: Fix MRQC register value.

Focus on the MRQE field of the MRQC register, which is 4 bits wide,
and we use these 3 types of values.

  - IXGBE_MRQC_RSSEN 0x1  (non VF mode)
  - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs)
  - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs)

If we always take a bitwise OR with IXGBE_MRQC_RSSEN,
IXGBE_MRQC_VMDQRSS32EN will never be chosen.
Select these 3 types of values for the proper case.

Signed-off-by: Yuichiro NAITO <naito.yuichiro at gmail.com>

Pull Request:   https://github.com/freebsd/freebsd-src/pull/2132

(cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09)
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+1-1sys/dev/ixgbe/if_sriov.c
+4-43 files

HardenedBSD/src 59dacd7lib/librpcsec_gss rpcsec_gss.c

librpcsec_gss: Fix a typo in a source code comment

- s/verfier/verifier/

MFC after:      3 days
DeltaFile
+1-1lib/librpcsec_gss/rpcsec_gss.c
+1-11 files

HardenedBSD/src 4177af3stand/powerpc/boot1.chrp Makefile

stand/powerpc: Fix a typo in a source code comment

- s/limitiations/limitations/

MFC after:      3 days
DeltaFile
+1-1stand/powerpc/boot1.chrp/Makefile
+1-11 files

HardenedBSD/src 6323e2bsys/rpc/rpcsec_gss rpcsec_gss.c

rpcsec_gss(3): Fix a typo in a source code comment

- s/verfier/verifier/

MFC after:      3 days
DeltaFile
+1-1sys/rpc/rpcsec_gss/rpcsec_gss.c
+1-11 files

HardenedBSD/src 9624633sys/fs/msdosfs msdosfs_fat.c

msdosfs(4): Fix two typos in source code comments

- s/unititialized/uninitialized/

MFC after:      3 days
DeltaFile
+2-2sys/fs/msdosfs/msdosfs_fat.c
+2-21 files

HardenedBSD/src 33e0180sys/dev/thunderbolt nhi.c

thunderbolt: Fix a typo in a source code comment

- s/Inititalize/Initialize/

MFC after:      3 days
DeltaFile
+1-1sys/dev/thunderbolt/nhi.c
+1-11 files

HardenedBSD/src 66a68a5sys/compat/linuxkpi/common/src linux_80211.c, sys/contrib/dev/rtw89 fw.c reg.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,097-90sys/contrib/dev/rtw89/fw.c
+924-10sys/contrib/dev/rtw89/reg.h
+664-159sys/compat/linuxkpi/common/src/linux_80211.c
+650-46sys/contrib/dev/rtw89/mac_be.c
+543-20sys/contrib/dev/rtw89/phy_be.c
+446-73sys/contrib/dev/rtw89/fw.h
+4,324-398178 files not shown
+8,816-2,034184 files

HardenedBSD/src 9d5983csys/contrib/dev/rtw89 fw.c reg.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,097-90sys/contrib/dev/rtw89/fw.c
+924-10sys/contrib/dev/rtw89/reg.h
+650-46sys/contrib/dev/rtw89/mac_be.c
+543-20sys/contrib/dev/rtw89/phy_be.c
+446-73sys/contrib/dev/rtw89/fw.h
+384-56sys/contrib/dev/rtw89/phy.c
+4,044-295134 files not shown
+7,550-1,662140 files

HardenedBSD/src d8fbbd3sys/contrib/openzfs/module/os/linux/spl spl-zone.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

zfs: merge openzfs/zfs at 1644e2ffd

Notable upstream pull request merges:
 #18148 d1b0a6982 draid: add failure domains support
 #18167 f203fedde Add zoned_uid property with additive least privilege
                  authorization
 #18191 -multiple FreeBSD: Fix a couple of races involving zvol creation
                  and teardown
 #18213 33ed68fc2 zpool create: report which device caused failure
 #18235 931deb290 Prevent range tree corruption race by updating
                  dnode_sync()
 #18282 b44a3ecf4 zpool: Change zpool offline spares policy
 #18310 -multiple Fix s_active leak in zfsvfs_hold() when z_unmounted is
                  true
 #18351 ce837a28e Bridge speculative and prescient prefetchers
 #18380 fc659bd6d draid: fix import failure after disks replacements
 #18385 16858492e FreeBSD: Implement relatime property
 #18390 a22b3f670 abd: Fix stats asymmetry in case of Direct I/O
 #18399 7b1682a82 Add support for POSIX_FADV_DONTNEED

    [10 lines not shown]
DeltaFile
+499-10sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+343-80sys/contrib/openzfs/module/zfs/vdev_draid.c
+385-28sys/contrib/openzfs/module/os/linux/spl/spl-zone.c
+307-11sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+24-216sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+237-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/zoned_uid_common.kshlib
+1,795-345164 files not shown
+9,625-848170 files

HardenedBSD/src 1c50cb1sys/modules/mt76 Makefile.inc

mt76: update module Makefile for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/mt76/Makefile.inc
+1-11 files

HardenedBSD/src 63a40b6sys/contrib/dev/mediatek/mt76 scan.c agg-rx.c, sys/contrib/dev/mediatek/mt76/mt7615 mac.c

mt76: update Mediatek's mt76 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-3sys/contrib/dev/mediatek/mt76/scan.c
+1-1sys/contrib/dev/mediatek/mt76/agg-rx.c
+1-1sys/contrib/dev/mediatek/mt76/mt7996/main.c
+1-1sys/contrib/dev/mediatek/mt76/mt7996/mcu.c
+1-1sys/contrib/dev/mediatek/mt76/mt7615/mac.c
+1-0sys/contrib/dev/mediatek/mt76/mt7996/mac.c
+6-73 files not shown
+9-79 files

HardenedBSD/src 9361fccshare/man/man5 src.conf.5

HBSD: Resolve merge conflict

Regen src.conf.5.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+7-513share/man/man5/src.conf.5
+7-5131 files

HardenedBSD/src 4034971lib/libarchive config_freebsd.h, share/man/man5 src.conf.5

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+664-159sys/compat/linuxkpi/common/src/linux_80211.c
+524-7share/man/man5/src.conf.5
+130-14sys/compat/linuxkpi/common/include/linux/overflow.h
+89-37lib/libarchive/config_freebsd.h
+35-54sys/compat/linuxkpi/common/include/net/mac80211.h
+75-4sys/compat/linuxkpi/common/include/net/cfg80211.h
+1,517-27539 files not shown
+1,778-37845 files

HardenedBSD/src 3780e6fsys/modules/rtw89 Makefile

rtw89: update module Makefile for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/rtw89/Makefile
+1-11 files

HardenedBSD/src 422e9c5sys/contrib/dev/rtw89 fw.c reg.h

rtw89: update Realtek's rtw89 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1,097-90sys/contrib/dev/rtw89/fw.c
+924-10sys/contrib/dev/rtw89/reg.h
+650-46sys/contrib/dev/rtw89/mac_be.c
+543-20sys/contrib/dev/rtw89/phy_be.c
+446-73sys/contrib/dev/rtw89/fw.h
+384-56sys/contrib/dev/rtw89/phy.c
+4,044-29538 files not shown
+5,680-54044 files

HardenedBSD/src 9ed3331sys/modules/iwlwifi Makefile

iwlwifi: update module Makefile for v7.0 driver version

Add the new file for nan in the mld subdriver.

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+2-2sys/modules/iwlwifi/Makefile
+2-21 files

HardenedBSD/src b2bd081sys/contrib/dev/iwlwifi/fw regulatory.c, sys/contrib/dev/iwlwifi/fw/api mac-cfg.h

iwlwifi: update Intel's mvm/mld drivers

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+299-0sys/contrib/dev/iwlwifi/mld/nan.c
+4-202sys/contrib/dev/iwlwifi/fw/regulatory.c
+201-4sys/contrib/dev/iwlwifi/mvm/fw.c
+11-192sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c
+152-7sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h
+137-5sys/contrib/dev/iwlwifi/mld/rx.c
+804-41074 files not shown
+1,831-1,10380 files

HardenedBSD/src aa0bc7cstand/powerpc/boot1.chrp Makefile

boot1.chrp: Specify --image-base

This is required for LLVM 22's ld.lld to avoid a build error:

ld.lld: error: section '.text' address (0x38000) is smaller than image base (0x10000000); specify --image-base
ld.lld: error: section '.rodata' address (0x3b308) is smaller than image base (0x10000000); specify --image-base
ld.lld: error: section '.data' address (0x3b610) is smaller than image base (0x10000000); specify --image-base
ld.lld: error: section '.bss' address (0x3f618) is smaller than image base (0x10000000); specify --image-base

Use 0x38000 for the image base, which is the address of the lowest
(and only) LOAD segment in the file.

Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D56459
DeltaFile
+1-1stand/powerpc/boot1.chrp/Makefile
+1-11 files

HardenedBSD/src cca22c3sys/net iflib.c

iflib: fix book keeping

iflib_txq_drain() returns the number of consumed entries. In the case
of TSO, a single entry can contain multiple TCP packets.

Reported by:            Ricardo Branco, David Wolfskill
Reviewed by:            gallatin
Fixes:                  3fade68cfdf9 ("iflib: accurately count bytes/segments for TSO")
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D56509
DeltaFile
+7-6sys/net/iflib.c
+7-61 files

HardenedBSD/src 29336f1sys/netinet tcp_subr.c tcp_var.h

tcp: Allocate t_tcpreq_info on demand

When TCP_REQUEST_TRK is enabled, the tcb grows by 600 bytes
to accommodate the t_tcpreq_info[MAX_TCP_TRK_REQ] array.
Even when the option is enabled, not every connection is using
this feature.  So let's allocate it on-demand, and save 600
bytes in the common case.

Sponsored by: Netflix
Reviewed by: rrs, tuexen
Differential Revision: https://reviews.freebsd.org/D56484
DeltaFile
+17-0sys/netinet/tcp_subr.c
+1-1sys/netinet/tcp_var.h
+18-12 files

HardenedBSD/src 05fe599share/man/man4 splash.4, stand/common gfx_fb.c bootstrap.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+16-4stand/common/gfx_fb.c
+19-1sys/dev/vt/vt_core.c
+11-3share/man/man4/splash.4
+13-0sys/kern/subr_module.c
+6-1stand/efi/loader/bootinfo.c
+3-1stand/common/bootstrap.h
+68-102 files not shown
+72-118 files

HardenedBSD/src 9038318sys/modules/rtw88 Makefile

rtw88: update module Makefile for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/rtw88/Makefile
+1-11 files

HardenedBSD/src 41b641csys/contrib/dev/rtw88 main.c phy.c

rtw88: update Realtek's rtw88 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+37-17sys/contrib/dev/rtw88/main.c
+20-0sys/contrib/dev/rtw88/phy.c
+2-4sys/contrib/dev/rtw88/sdio.c
+3-2sys/contrib/dev/rtw88/usb.c
+2-2sys/contrib/dev/rtw88/util.c
+2-1sys/contrib/dev/rtw88/rtw8822b.c
+66-2610 files not shown
+78-3416 files

HardenedBSD/src 480ba21. README.md

README: Update and harmonize

MFC after:      1 week
Reviewed by:    imp, markj, jhb
Differential Revision:  https://reviews.freebsd.org/D56499
DeltaFile
+12-11README.md
+12-111 files

HardenedBSD/src d618ba3usr.bin/du/tests du_test.sh

du: Set BLOCKSIZE before running tests

Several testcases assume BLOCKSIZE=K, so set it at the top of the
script.  This fixes an issue where the tests would sometimes fail
when run under sudo.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D56476
DeltaFile
+4-0usr.bin/du/tests/du_test.sh
+4-01 files

HardenedBSD/src 9899c8dsys/tools kernel-gdb.py

gdb: Print a stack trace if a python command raises an error

MFC after:      1 week
DeltaFile
+2-0sys/tools/kernel-gdb.py
+2-01 files