wifi: mwifiex: Detach sync cmd buffer on interrupted wait
Subsystems (2)
PATCH 1/2 wifi: mwifiex: Detach sync cmd buffer on interrupted wait
From: Fabio Estevam <[email protected]>
mwifiex synchronous commands keep the caller-provided data buffer in cmd_node->data_buf. Several callers pass stack-allocated objects there.
If wait_event_interruptible_timeout() is interrupted, the caller can return and release that stack object while the firmware command is still the current command. A late firmware response then reaches the normal response handler, which can copy data through cmd_node->data_buf into the stale stack address.
This fixes a stack corruption observed during repeated association and disassociation cycles. The panic trace showed the command wait being interrupted immediately before a bad pointer dereference:
cmd_wait_q terminated: -512
Unable to handle kernel paging request at virtual address 002c583837384662 Kernel panic - not syncing: stack-protector: Kernel stack is corrupted ... Tainted: [M]=MACHINE_CHECK
The fault address decodes as little-endian ASCII:
0x002c583837384662 -> "bF878X,\0"
which is a fragment of the VERSION_EXT firmware string exposed as debugfs "verext":
w8997o-V4, RF878X, FP92, 16.92.21.p153.7
The same runs also showed corrupted control data containing:
0x2400372e333531 -> "153.7\0$"
which is the tail of the same VERSION_EXT string. This points at a late VERSION_EXT response writing through a stale stack-backed data_buf after the interrupted wait returned.
After cancelling pending commands on an interrupted or timed-out wait, detach the caller-owned data buffer from the still-current command. This preserves the existing command cancellation behaviour while preventing a late response from writing through a pointer whose lifetime ended with the waiting caller.
Tested on an i.MX8MP board using an 88W8997.
--- drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +12 -0
@@ -57,6 +57,18 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter,mwifiex_dbg (adapter,ERROR ,"cmd_wait_q terminated: %d\n" , status);mwifiex_cancel_all_pending_cmd (adapter); + +/* The command response path writes through cmd_node->data_buf. +* On an interrupted wait, the caller can return and release a +* stack-allocated data_buf before a late firmware response is +* processed. Detach the caller-owned buffer from the current +* command so a late response cannot corrupt freed stack memory. +*/ +spin_lock_bh (&adapter->mwifiex_cmd_lock); +if (adapter->curr_cmd == cmd_queued) + adapter->curr_cmd->data_buf =NULL ; +spin_unlock_bh (&adapter->mwifiex_cmd_lock); +return status; }
Signature · 1 line
2.43.0
PATCH 2/2 wifi: mwifiex: Remove WQ_HIGHPRI from main workqueue
From: Fabio Estevam <[email protected]>
The MWIFIEX_WORK_QUEUE handles command and event processing, including the commands used for scheduled scans.
Running this work on the high-priority worker pool can interfere with latency-sensitive workloads. On an i.MX8MP-based audio system using an 88W8997, background scheduled scans caused audible glitches in USB audio playback.
Remove WQ_HIGHPRI from the main workqueue so that command and scan processing use the normal-priority worker pool.
Leave the RX and host MLME workqueues unchanged.
--- drivers/net/wireless/marvell/mwifiex/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/marvell/mwifiex/main.c +2 -2
@@ -1550,7 +1550,7 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter) adapter->workqueue =alloc_workqueue ("MWIFIEX_WORK_QUEUE" , -WQ_HIGHPRI |WQ_MEM_RECLAIM |WQ_UNBOUND ,0 ); +WQ_MEM_RECLAIM |WQ_UNBOUND ,0 );if (!adapter->workqueue) goto err_kmalloc;
@@ -1716,7 +1716,7 @@ mwifiex_add_card(void *card, struct completion *fw_done, adapter->workqueue =alloc_workqueue ("MWIFIEX_WORK_QUEUE" , -WQ_HIGHPRI |WQ_MEM_RECLAIM |WQ_UNBOUND ,0 ); +WQ_MEM_RECLAIM |WQ_UNBOUND ,0 );if (!adapter->workqueue) goto err_kmalloc;
Signature · 1 line
2.43.0