454fd69589
This contains the following commits: ``` git log --oneline v6.12.52...v6.12.61 -- drivers/net/wireless/ net/mac80211/ net/wireless/ a1eb56723b32 wifi: ath12k: correctly handle mcast packets for clients c0a9c2c1b7b9 wifi: mac80211: use wiphy_hrtimer_work for csa.switch_work d4caee32a9f8 wifi: cfg80211: add an hrtimer based delayed work item 6455948c8aab wifi: mac80211: reject address change while connecting 80dc5a2ce5b7 wifi: ath11k: Clear affinity hint before calling ath11k_pcic_free_irq() in error path acd24d509227 wifi: mac80211: skip rate verification for not captured PSDUs 53cf801b8555 wifi: ath11k: zero init info->status in wmi_process_mgmt_tx_comp() e8fa86b0bd96 wifi: mac80211_hwsim: Limit destroy_on_close radio removal to netgroup 77d4afd6c78b Revert "wifi: ath10k: avoid unnecessary wait for service ready message" 07d862c7de3d wifi: ath12k: Increase DP_REO_CMD_RING_SIZE to 256 522734fc807c wifi: mac80211: Track NAN interface start/stop 8db790c2491e wifi: ath10k: Fix connection after GTK rekeying 72f1984246e6 wifi: rtw89: renew a completion for each H2C command waiting C2H event 336da4414300 wifi: rtw89: obtain RX path from ppdu status IE00 da91687f01f4 wifi: mt76: mt7996: fix memory leak on mt7996_mcu_sta_key_tlv error a534dd44b70e wifi: mt76: mt76_eeprom_override to int aa5ed215cfe8 wifi: mt76: mt7996: Temporarily disable EPCS efe2ef24feab wifi: mt76: mt7921: Add 160MHz beamformee capability for mt7922 device 5de410dfb4d9 wifi: mac80211: Fix HE capabilities element check f157d1cb2cdc wifi: iwlwifi: fw: Add ASUS to PPAG and TAS list c9df78e84e85 wifi: mac80211: Fix 6 GHz Band capabilities element advertisement in lower bands 958234997dd5 wifi: rtw89: fix BSSID comparison for non-transmitted BSSID ca18975c4de2 wifi: rtw89: wow: remove notify during WoWLAN net-detect bc1ca06998c1 wifi: rtw88: sdio: use indirect IO for device registers before power-on 8ebef59d0294 wifi: rtw89: print just once for unknown C2H events 5596a90c8952 wifi: mac80211: fix key tailroom accounting leak 23b8682f05ec wifi: mac80211: don't mark keys for inactive links as uploaded e3373f10c6a6 wifi: ath11k: avoid bit operation on key flags 50f50dd024b4 wifi: ath11k: add support for MU EDCA 2a6cd5951ba8 wifi: ath12k: free skb during idr cleanup callback 775e37df2acc wifi: ath11k: Add missing platform IDs for quirk table c4840991ee4c wifi: ath10k: Fix memory leak on unsupported WMI command a6eed58249e7 wifi: brcmfmac: fix crash while sending Action Frames in standalone AP Mode 57100b87c778 wifi: ath12k: fix read pointer after free in ath12k_mac_assign_vif_to_vdev() 4a63523d3541 wifi: cfg80211: Add missing lock in cfg80211_check_and_end_cac() e9fd43b799d2 wifi: rtw89: avoid possible TX wait initialization race b419093e5e42 wifi: mt76: mt7921u: Add VID/PID for Netgear A7500 feb1774aaf85 wifi: mt76: mt7925u: Add VID/PID for Netgear A9000 bd3ac455a88d wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again 8055133a9f64 wifi: rtw89: avoid circular locking dependency in ser_state_run() 1c873416758f wifi: mac80211: fix Rx packet handling when pubsta information is not available 6e7d9fa61d7d wifi: ath10k: avoid unnecessary wait for service ready message 8d4f6ab4c53e wifi: ath12k: fix wrong logging ID used for CE fc00890c55e3 wifi: mt76: mt7915: fix mt7981 pre-calibration e18c4e6ba36c wifi: mt76: mt7996: Convert mt7996_wed_rro_addr to LE f481404a9826 wifi: mt76: mt7996: Fix RX packets configuration for primary WED device 57519239c76c wifi: mt76: fix potential memory leak in mt76_wmac_probe() 27c8e2e4b56f wifi: iwlwifi: Remove redundant header files 605402433eb8 wifi: mwifiex: send world regulatory domain to driver ``` The removed patch was added upstream. Link: https://github.com/openwrt/openwrt/pull/21134 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 15 Nov 2024 12:28:43 +0100
|
|
Subject: [PATCH] wifi: mac80211: fix vif addr when switching from monitor
|
|
to station
|
|
|
|
Since adding support for opting out of virtual monitor support, a zero vif
|
|
addr was used to indicate passive vs active monitor to the driver.
|
|
This would break the vif->addr when changing the netdev mac address before
|
|
switching the interface from monitor to sta mode.
|
|
Fix the regression by adding a separate flag to indicate whether vif->addr
|
|
is valid.
|
|
|
|
Reported-by: syzbot+9ea265d998de25ac6a46@syzkaller.appspotmail.com
|
|
Fixes: 9d40f7e32774 ("wifi: mac80211: add flag to opt out of virtual monitor support")
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/include/net/mac80211.h
|
|
+++ b/include/net/mac80211.h
|
|
@@ -1972,6 +1972,8 @@ enum ieee80211_neg_ttlm_res {
|
|
* @neg_ttlm: negotiated TID to link mapping info.
|
|
* see &struct ieee80211_neg_ttlm.
|
|
* @addr: address of this interface
|
|
+ * @addr_valid: indicates if the address is actively used. Set to false for
|
|
+ * passive monitor interfaces, true in all other cases.
|
|
* @p2p: indicates whether this AP or STA interface is a p2p
|
|
* interface, i.e. a GO or p2p-sta respectively
|
|
* @netdev_features: tx netdev features supported by the hardware for this
|
|
@@ -2011,6 +2013,7 @@ struct ieee80211_vif {
|
|
u16 valid_links, active_links, dormant_links, suspended_links;
|
|
struct ieee80211_neg_ttlm neg_ttlm;
|
|
u8 addr[ETH_ALEN] __aligned(2);
|
|
+ bool addr_valid;
|
|
bool p2p;
|
|
|
|
u8 cab_queue;
|
|
--- a/net/mac80211/iface.c
|
|
+++ b/net/mac80211/iface.c
|
|
@@ -296,13 +296,8 @@ static int _ieee80211_change_mac(struct
|
|
ret = eth_mac_addr(sdata->dev, sa);
|
|
|
|
if (ret == 0) {
|
|
- if (check_dup) {
|
|
- memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN);
|
|
- ether_addr_copy(sdata->vif.bss_conf.addr, sdata->vif.addr);
|
|
- } else {
|
|
- memset(sdata->vif.addr, 0, ETH_ALEN);
|
|
- memset(sdata->vif.bss_conf.addr, 0, ETH_ALEN);
|
|
- }
|
|
+ memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN);
|
|
+ ether_addr_copy(sdata->vif.bss_conf.addr, sdata->vif.addr);
|
|
}
|
|
|
|
/* Regardless of eth_mac_addr() return we still want to add the
|
|
@@ -1353,6 +1348,8 @@ int ieee80211_do_open(struct wireless_de
|
|
}
|
|
}
|
|
|
|
+ sdata->vif.addr_valid = sdata->vif.type != NL80211_IFTYPE_MONITOR ||
|
|
+ (sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE);
|
|
switch (sdata->vif.type) {
|
|
case NL80211_IFTYPE_AP_VLAN:
|
|
/* no need to tell driver, but set carrier and chanctx */
|