github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge tag 'mm81x-next-2026-07-31' of https://github.com/MorseMicroLabs/linux-wireless

Browse Source 
Lachlan Hodges says:
====================
- Just a single fix for synchronously shutting down timers to prevent
a UaF.
====================

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2026-08-02 18:26:42 +02:00
commit ea7ebb542d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/morsemicro/mm81x/mac.c
View File

@ -2349,7 +2349,7 @@ static void mm81x_stale_tx_status_timer(struct timer_list *t)
static void mm81x_stale_tx_status_timer_finish(struct mm81x *mors)
{
timer_delete_sync_try(&mors->stale_status.timer);
timer_shutdown_sync(&mors->stale_status.timer);
}
static void mm81x_mac_stale_tx_status_timer_init(struct mm81x *mors)

2
drivers/net/wireless/morsemicro/mm81x/rc.c
View File

@ -60,8 +60,8 @@ void mm81x_rc_init(struct mm81x *mors)
void mm81x_rc_deinit(struct mm81x *mors)
{
timer_shutdown_sync(&mors->mrc.timer);
cancel_work_sync(&mors->mrc.work);
timer_delete_sync_try(&mors->mrc.timer);
}
static void mm81x_rc_sta_config_guard_per_bw(struct ieee80211_sta *sta,

2
drivers/net/wireless/morsemicro/mm81x/yaps.c
View File

@ -597,7 +597,7 @@ static void mm81x_yaps_q_chip_full_timer_init(struct mm81x_yaps *yaps)
static void mm81x_yaps_q_chip_full_timer_finish(struct mm81x_yaps *yaps)
{
timer_delete_sync_try(&yaps->chip_queue_full.timer);
timer_shutdown_sync(&yaps->chip_queue_full.timer);
}
int mm81x_yaps_init(struct mm81x *mors)