Skip to content

Commit 1801a94

Browse files
Miriam-Racheljmberg-intel
authored andcommitted
wifi: iwlwifi: trans: cancel restart work on op mode leave
If the restart work happens to run after the opmode left (i.e. called iwl_trans_op_mode_leave), then the opmode memory (including its mutex) is likely to be freed already, and trans->opmode is NULL. Although the hw is stopped in that stage, which means that this restart got aborted (i.e. STATUS_RESET_PENDING will be cleared), it still can access trans->opmode (NULL pointer dereference) or the opmodes memory (which is freed). Fix this by canceling the restart wk in iwl_trans_op_mode_leave. Also make sure that the restart wk is really aborted. Fixes: 7391b2a ("wifi: iwlwifi: rework firmware error handling") Signed-off-by: Miri Korenblit <[email protected]> Reviewed-by: Johannes Berg <[email protected]> Link: https://patch.msgid.link/20250306122425.801301ba1b8b.I6f6143f550b6335b699920c5d4b2b78449607a96@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent b8c8a03 commit 1801a94

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/net/wireless/intel/iwlwifi/iwl-trans.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,8 @@ void iwl_trans_op_mode_leave(struct iwl_trans *trans)
403403

404404
iwl_trans_pcie_op_mode_leave(trans);
405405

406+
cancel_work_sync(&trans->restart.wk);
407+
406408
trans->op_mode = NULL;
407409

408410
trans->state = IWL_TRANS_NO_FW;

0 commit comments

Comments
 (0)