Skip to content

wifi: mt76: mt7925: fix mutex protection and NULL pointer bugs #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zbowling wants to merge 3 commits into
base: master
Choose a base branch
from
+22 −2
Open

wifi: mt76: mt7925: fix mutex protection and NULL pointer bugs #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
053fd61
wifi: mt76: mt7925: fix NULL pointer dereference in vif iteration
zbowling Jan 1, 2026
64e4363
wifi: mt76: mt7925: fix missing mutex protection in reset and ROC abort
zbowling Jan 1, 2026
d597c25
wifi: mt76: mt7925: fix missing mutex protection in runtime PM and ML…
zbowling Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions mt7925/mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,12 @@ mt7925_vif_connect_iter(void *priv, u8 *mac,
bss_conf = mt792x_vif_to_bss_conf(vif, i);
mconf = mt792x_vif_to_link(mvif, i);

/* Skip links that don't have bss_conf set up yet in mac80211.
* This can happen during HW reset when link state is inconsistent.
*/
if (!bss_conf)
continue;

mt76_connac_mcu_uni_add_dev(&dev->mphy, bss_conf, &mconf->mt76,
&mvif->sta.deflink.wcid, true);
mt7925_mcu_set_tx(dev, bss_conf);
Expand Down Expand Up @@ -1328,9 +1334,11 @@ void mt7925_mac_reset_work(struct work_struct *work)
dev->hw_full_reset = false;
pm->suspended = false;
ieee80211_wake_queues(hw);
mt792x_mutex_acquire(dev);
ieee80211_iterate_active_interfaces(hw,
IEEE80211_IFACE_ITER_RESUME_ALL,
mt7925_vif_connect_iter, NULL);
mt792x_mutex_release(dev);
mt76_connac_power_save_sched(&dev->mt76.phy, pm);

mt7925_regd_change(&dev->phy, "00");
Expand Down
14 changes: 12 additions & 2 deletions mt7925/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,9 +751,11 @@ void mt7925_set_runtime_pm(struct mt792x_dev *dev)
bool monitor = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);

pm->enable = pm->enable_user && !monitor;
mt792x_mutex_acquire(dev);
ieee80211_iterate_active_interfaces(hw,
IEEE80211_IFACE_ITER_RESUME_ALL,
mt7925_pm_interface_iter, dev);
mt792x_mutex_release(dev);
pm->ds_enable = pm->ds_enable_user && !monitor;
mt7925_mcu_set_deep_sleep(dev, pm->ds_enable);
}
Expand Down Expand Up @@ -1301,12 +1303,12 @@ mt7925_mlo_pm_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
if (mvif->mlo_pm_state != MT792x_MLO_CHANGED_PS)
return;

mt792x_mutex_acquire(dev);
for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
bss_conf = mt792x_vif_to_bss_conf(vif, i);
if (!bss_conf)
continue;
mt7925_mcu_uni_bss_ps(dev, bss_conf);
}
mt792x_mutex_release(dev);
}

void mt7925_mlo_pm_work(struct work_struct *work)
Expand All @@ -1315,9 +1317,11 @@ void mt7925_mlo_pm_work(struct work_struct *work)
mlo_pm_work.work);
struct ieee80211_hw *hw = mt76_hw(dev);

mt792x_mutex_acquire(dev);
ieee80211_iterate_active_interfaces(hw,
IEEE80211_IFACE_ITER_RESUME_ALL,
mt7925_mlo_pm_iter, dev);
mt792x_mutex_release(dev);
}

void mt7925_scan_work(struct work_struct *work)
Expand Down Expand Up @@ -1630,6 +1634,8 @@ static void mt7925_ipv6_addr_change(struct ieee80211_hw *hw,

for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
bss_conf = mt792x_vif_to_bss_conf(vif, i);
if (!bss_conf)
continue;
__mt7925_ipv6_addr_change(hw, bss_conf, idev);
}
}
Expand Down Expand Up @@ -1861,6 +1867,8 @@ static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_ARP_FILTER) {
for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
bss_conf = mt792x_vif_to_bss_conf(vif, i);
if (!bss_conf)
continue;
mt7925_mcu_update_arp_filter(&dev->mt76, bss_conf);
}
}
Expand All @@ -1876,6 +1884,8 @@ static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,
} else if (mvif->mlo_pm_state == MT792x_MLO_CHANGED_PS) {
for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
bss_conf = mt792x_vif_to_bss_conf(vif, i);
if (!bss_conf)
continue;
mt7925_mcu_uni_bss_ps(dev, bss_conf);
}
}
Expand Down
2 changes: 2 additions & 0 deletions mt7925/pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,9 @@ static int mt7925_pci_suspend(struct device *device)
cancel_delayed_work_sync(&pm->ps_work);
cancel_work_sync(&pm->wake_work);

mt792x_mutex_acquire(dev);
mt7925_roc_abort_sync(dev);
mt792x_mutex_release(dev);

err = mt792x_mcu_drv_pmctrl(dev);
if (err < 0)
Expand Down