HardenedBSD/src bf8f45bsys/dev/acpi_support acpi_system76.c, sys/modules/acpi/acpi_system76 Makefile

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+261-31sys/dev/acpi_support/acpi_system76.c
+1-0sys/modules/acpi/acpi_system76/Makefile
+262-312 files

HardenedBSD/src 756e2adsys/dev/acpi_support acpi_system76.c, sys/modules/acpi/acpi_system76 Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+261-31sys/dev/acpi_support/acpi_system76.c
+1-0sys/modules/acpi/acpi_system76/Makefile
+262-312 files

HardenedBSD/src fd9551asys/compat/linuxkpi/common/src linux_80211.c, sys/contrib/dev/iwlwifi/fw/api rx.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+931-804sys/contrib/dev/iwlwifi/mld/rx.c
+0-809sys/contrib/dev/iwlwifi/mvm/link.c
+359-200sys/contrib/dev/iwlwifi/mld/d3.c
+49-347sys/contrib/dev/iwlwifi/mvm/d3.c
+201-102sys/compat/linuxkpi/common/src/linux_80211.c
+286-0sys/contrib/dev/iwlwifi/fw/api/rx.h
+1,826-2,262111 files not shown
+3,436-4,556117 files

HardenedBSD/ports 2290b4ddevel/hs-cabal-install/files patch-cabal-benchmarks_bench_CabalBenchmarks.hs, lang/ghc/files patch-libraries_semaphore-compat_src_System_Semaphore.hs

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+209-231sysutils/cardano-cli/distinfo
+113-129sysutils/rust-coreutils/distinfo
+96-97sysutils/cardano-cli/Makefile
+55-63sysutils/rust-coreutils/Makefile.crates
+44-0lang/ghc/files/patch-libraries_semaphore-compat_src_System_Semaphore.hs
+14-0devel/hs-cabal-install/files/patch-cabal-benchmarks_bench_CabalBenchmarks.hs
+531-52020 files not shown
+594-56126 files

HardenedBSD/ports b45278fdevel/violet distinfo Makefile

devel/violet: Update 2.3.0 => 2.3.1

Approved by:  db@, yuri@ (Mentors, implicit)
DeltaFile
+3-3devel/violet/distinfo
+1-2devel/violet/Makefile
+4-52 files

HardenedBSD/src a367a62sys/contrib/dev/iwlwifi/mld mld.c, sys/contrib/dev/iwlwifi/mvm ops.c

iwlwifi: adjust driver description

Adjust the module driver descriptions for mvm and mld to make it clear
that this is not a driver for Linux but a Linux-based driver for FreeBSD.
Cleanup surroundings.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 782fe2f8d90488a61ecdbe1d4b245900a88bee56)
DeltaFile
+6-0sys/contrib/dev/iwlwifi/mld/mld.c
+1-2sys/contrib/dev/iwlwifi/mvm/ops.c
+7-22 files

HardenedBSD/src 0cac462sys/contrib/dev/iwlwifi/mld mld.c

iwlwifi: mld: add LINUXKPI_PARAM_PREFIX

Add a LINUXKPI_PARAM_PREFIX to mld to properly export the
power_scheme module_param (sysctl).  This is especially needed given
mvm has the same parameter and we need to avoid a clash.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 7db8503bda2724ae145475c3260d581bb98613ad)
DeltaFile
+4-0sys/contrib/dev/iwlwifi/mld/mld.c
+4-01 files

HardenedBSD/src 79aafaesys/contrib/dev/iwlwifi/fw/api rx.h, sys/contrib/dev/iwlwifi/mld rx.c d3.c

iwlwifi: update Intel's mvm/mld drivers

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

(cherry picked from commit 95dd8736f846dee1208fe4c306caf1b0baf3caba)
DeltaFile
+931-804sys/contrib/dev/iwlwifi/mld/rx.c
+0-809sys/contrib/dev/iwlwifi/mvm/link.c
+359-200sys/contrib/dev/iwlwifi/mld/d3.c
+49-347sys/contrib/dev/iwlwifi/mvm/d3.c
+286-0sys/contrib/dev/iwlwifi/fw/api/rx.h
+175-77sys/contrib/dev/iwlwifi/pcie/gen1_2/trans.c
+1,800-2,237103 files not shown
+3,127-4,432109 files

HardenedBSD/src 169ab96sys/contrib/dev/iwlwifi/mld mld.c

iwlwifi: mld: move module_init() to SI_ORDER_SECOND

In FreeBSD the iwlwifi driver is a single kernel module.
As for iwlwifi/mvm we need to make sure the common "iwlwifi drv" code
is initialized before trying to register the mld sub-driver
in order for lists, etc. in the registration code to be initialized.
We do this by using an extended (FreeBSD specific) version of
module_init which overrides the order parameter of the SYSINIT.
Otherwise we can randomly (depending on SYSINIT run order) run into
a NULL pointer deref panic.

Sponsored by:   The FreeBSD Foundation
PR:             291120

(cherry picked from commit 551c4cb74a807ceae55288bf273f5cfeb37c7c91)
DeltaFile
+4-0sys/contrib/dev/iwlwifi/mld/mld.c
+4-01 files

HardenedBSD/src 5f68af1sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: change teardown order of disassoc and sta rm

In lkpi_sta_auth_to_scan() we remove the sta from the firmware
for everything supporting (*sta_state).

We used to run into issues here with iwlwifi in that we had to
use a specific order: set vif->cfg.assoc = false, .aid = 0,
then remove the sta, and then send the mac update as otherwise
we would either have the sta silently removed (if we run
(*bss_info_change) first and fail then or silently not have the
sta removed and upon sta add we would trigger the fw crash.

The order of events seem to have changed now and especially BE200
(iwlwifi/mld) is picky about this and would crash the firmware with
something like:

        iwlwifi0: 0x20103311 | ADVANCED_SYSASSERT
        iwlwifi0: 0x00000000 | umac branchlink1
        iwlwifi0: 0xC00808AA | umac branchlink2

    [22 lines not shown]
DeltaFile
+30-27sys/compat/linuxkpi/common/src/linux_80211.c
+30-271 files

HardenedBSD/src 651fcd5sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: fix typo

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit fa41408d6043df3779d94bd1ac871a5ba8f4dafb)
DeltaFile
+1-1sys/compat/linuxkpi/common/src/linux_80211.c
+1-11 files

HardenedBSD/src 8642c8csys/compat/linuxkpi/common/src linux_80211.c linux_80211_macops.c

LinuxKPI: 802.11: split (*bss_info_changed) up for more modern drivers

With the advent of MLO some of the updates (*bss_info_changed) would
have done are not per-link.  This had (*vif_cfg_changed) and
(*link_conf_changed) introduced which are used by iwlwifi, rtw89,
select mt76 drivers, and ath12k currently it seems.
A driver normally only supports on or the other set.

Factor out the call to (*bss_info_changed) into an internal function.
There split the options up depending on whether they are for the
vif or a link and leave a fallback to (*bss_info_changed) for older
drivers.

Add the mac80211 ops implementations for the two new calls along with
a currently unused backup option for (*bss_info_changed) for each
as I assume we will eventually call the directly rather than from the
internal wrapper function.

Sponsored by:   The FreeBSD Foundation

    [2 lines not shown]
DeltaFile
+61-14sys/compat/linuxkpi/common/src/linux_80211.c
+63-7sys/compat/linuxkpi/common/src/linux_80211_macops.c
+4-0sys/compat/linuxkpi/common/src/linux_80211.h
+128-213 files

HardenedBSD/src 9e989afsys/compat/linuxkpi/common/include/linux dma-mapping.h

LinuxKPI: pass attrs in more places in dma-mapping.h

Various macros (dma_map_sg_attrs, dma_unmap_sg_attrs,
dma_map_single_attrs, and dma_unmap_single_attrs) currently supress
passing on the attrs argument.  Their implementation (even though at
times still marked the argument __unused; we remove that) have long
gained support for handling the argument.
With ofed fixed (5edf24aac1d09), pass the argument through so that
other drivers using these functions may hopefully work just a bit
better as well.

Sponsored by:   The FreeBSD Foundation
Reviewed by:    kib
Differential Revision: https://reviews.freebsd.org/D55391

(cherry picked from commit 31c3cba807839a1a16e6f4bca91d530d9342b61a)
DeltaFile
+6-6sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+6-61 files

HardenedBSD/src d9f6064sys/contrib/dev/iwlwifi/mvm mld-mac80211.c

iwlwifi: fixup link_id for certain cases

In iwl_mvm_mld_vif_cfg_changed_station() if we do not do MLO (which we
do not do yet at all), dtim_period is not yet set but asssoc is
(our common case) the link_id can become -1 as active_links is always
0 for the non-MLO case.

This leads to logging of a WARN;
Invalid link ID for session protection: 4294967295

Fixup the link_id if it is -1 to be 0.  This is the deflink link_id so
that should always be fine in this case.

For Linux 7.0-rc2 that code is already gone so this is a local temporary
stopgap measure for the mvm-mld devices (e.g., some AX210).

Sponosred by:   The FreeBSD Foundation

(cherry picked from commit 760e0a18d3033152899fbd0e3f587dfe3c28d6bf)
DeltaFile
+8-0sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c
+8-01 files

HardenedBSD/src 4e7b625sys/net80211 ieee80211_sta.c

net80211: sta: use IEEE80211_STATUS_SUCCESS instead of magic 0

Rather than using the status != 0 check use the way more descriptive
status != IEEE80211_STATUS_SUCCESS definition.  This makes it a lot
more clear what is checked here.  While here add a comment in case
aof the (Re)Assoc Resp failure as we do not update state in that case
but rely on a timeout which will bounce us back to State 1
(cf. 802.11-2024, Figure 11-23) which means SCAN in our case, rather
than possibly moving us back to AUTH.  We will likely have to revisit
this when SAE hits the tree.

Sponsored by:   The FreeBSD Foundation
Reviewed by:    adrian
Differential Revision: https://reviews.freebsd.org/D55643

(cherry picked from commit 9b03cc2a70e4b6354c5f5b90e4c51b850b6b1dd2)
DeltaFile
+8-3sys/net80211/ieee80211_sta.c
+8-31 files

HardenedBSD/src 748f775sys/compat/linuxkpi/common/include/net mac80211.h, sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: improve prep_tx_info

Over time struct ieee80211_prep_tx_info has grown further fields.
One which is becoming mandatory is the subtype (of the mgmt frame).
iwlwifi(mld) has a WARN for it if it does not match, so we now have
to set this for proper operation.  In addition we are tyring to improve
the situation of setting/unsetting (prepare_tx/complete_tx) in various
states and cleanup the use of other fields but link_id which we now
leave as a marker for the future everywhere.
The general problem we are facing is that our hook surface in this case
is the state machine but likely would have to be tx/rx mgmt frames but
we would alos have to driver the TX queues from there which is tricky.
The long-term answer is to change net80211.

Further the hardware flag DEAUTH_NEED_MGD_TX_PREP is dead and was
removed again in favour of leting drivers deal with it.  iwlwifi(mvm)
likely being the only driver which ever used this.

Sponsored by:   The FreeBSD Foundation

    [2 lines not shown]
DeltaFile
+72-21sys/compat/linuxkpi/common/src/linux_80211.c
+0-1sys/compat/linuxkpi/common/include/net/mac80211.h
+72-222 files

HardenedBSD/src ad85b6bsys/dev/dpaa2 dpaa2_buf.c

dpaa2: improve error messages and log requested cluster size

If m_getjcl() fails we want to know the size we requested in order to
have a chance to evaluate the problem better.

Reviewed by:    tuexen
Differential Revision: https://reviews.freebsd.org/D55555

(cherry picked from commit c3577fcf3fd0494cc992021d4debbca09241a49e)
DeltaFile
+2-1sys/dev/dpaa2/dpaa2_buf.c
+2-11 files

HardenedBSD/src 81b53d3sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: fix typo

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit fa0f891d54449837b47f2ef2266163bdd9117879)
DeltaFile
+1-1sys/compat/linuxkpi/common/src/linux_80211.c
+1-11 files

HardenedBSD/src ca69d10sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue()

No functional changes.  Just moved the function within the file.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 3d3303b756ad4ee3ae520f6d07df6978d049a871)
DeltaFile
+37-39sys/compat/linuxkpi/common/src/linux_80211.c
+37-391 files

HardenedBSD/ports ff3022baudio/pt2-clone distinfo Makefile

audio/pt2-clone: Update to 1.81
DeltaFile
+3-3audio/pt2-clone/distinfo
+1-1audio/pt2-clone/Makefile
+4-42 files

HardenedBSD/ports d1d007eaudio/ft2-clone distinfo Makefile, audio/ft2-clone/files patch-CMakeLists.txt

audio/ft2-clone: Update to 2.10
DeltaFile
+11-0audio/ft2-clone/files/patch-CMakeLists.txt
+3-3audio/ft2-clone/distinfo
+1-1audio/ft2-clone/Makefile
+15-43 files

HardenedBSD/ports 086a074net-mgmt/nagstamon Makefile distinfo

net-mgmt/nagstamon: Update to 3.18.0
DeltaFile
+4-4net-mgmt/nagstamon/Makefile
+3-3net-mgmt/nagstamon/distinfo
+7-72 files

HardenedBSD/src 8f0ea06sys/netinet6 in6_ifattach.c

netinet6: Fix memory leak on auto_linklocal

release the refcount of link-local prefix information to ensure
it gets freed when the address is deleted.

Reviewed By: zlei, ivy
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D55593

(cherry picked from commit b55bffeaaf9bae5dc7aa21eae441d89c999ebab8)
DeltaFile
+2-2sys/netinet6/in6_ifattach.c
+2-21 files

HardenedBSD/ports f435a42sysutils/rust-coreutils distinfo Makefile.crates

sysutils/rust-coreutils: update to 0.7.0

Changelog:      https://github.com/uutils/coreutils/releases/tag/0.7.0
DeltaFile
+113-129sysutils/rust-coreutils/distinfo
+55-63sysutils/rust-coreutils/Makefile.crates
+1-1sysutils/rust-coreutils/Makefile
+169-1933 files

HardenedBSD/ports 28220e6x11/slock distinfo Makefile

x11/slock: update to 1.6
DeltaFile
+3-3x11/slock/distinfo
+1-2x11/slock/Makefile
+4-52 files

HardenedBSD/ports dfd5f9ex11-wm/dwm distinfo Makefile

x11-wm/dwm: update to 6.8

This fixes a regression in getatomprop(): https://git.suckless.org/dwm/commit/a9aa0d8ffbb548b0b1f9f755557aef2482c0f820.html

Threads:
* https://lists.suckless.org/dev/2601/35936.html
* https://lists.suckless.org/hackers/2601/19537.html
DeltaFile
+3-3x11-wm/dwm/distinfo
+1-1x11-wm/dwm/Makefile
+4-42 files

HardenedBSD/src 105869asys/dev/acpi_support acpi_system76.c, sys/modules/acpi/acpi_system76 Makefile

acpi_system76: Add backlight(9) support for keyboard

Reviewed by: wulf
Differential Revision: https://reviews.freebsd.org/D55716
DeltaFile
+145-0sys/dev/acpi_support/acpi_system76.c
+1-0sys/modules/acpi/acpi_system76/Makefile
+146-02 files

HardenedBSD/src f87ba45sys/dev/acpi_support acpi_system76.c

acpi_system76: Add support for battary charge thresholds

Reviewed by: wulf
Differential Revision: https://reviews.freebsd.org/D55710
DeltaFile
+116-31sys/dev/acpi_support/acpi_system76.c
+116-311 files

HardenedBSD/ports 95f8639net-im/gotosocial distinfo Makefile

net-im/gotosocial: update to 0.21.1

PR: 293678
DeltaFile
+5-5net-im/gotosocial/distinfo
+1-2net-im/gotosocial/Makefile
+6-72 files

HardenedBSD/ports 98214c9lang/ghc Makefile, lang/ghc/files patch-libraries_semaphore-compat_src_System_Semaphore.hs

lang/ghc: Add patch fixing the semaphore-compat package
DeltaFile
+44-0lang/ghc/files/patch-libraries_semaphore-compat_src_System_Semaphore.hs
+1-1lang/ghc/Makefile
+45-12 files