Patch "iwlwifi: mvm: avoid crash on restart w/o reserved queues" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iwlwifi: mvm: avoid crash on restart w/o reserved queues
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-mvm-avoid-crash-on-restart-w-o-reserved-queues.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
03c902bff524e0cf664737a33f2365f7837040bfMon Sep 17 00:00:00 2001
From: Johannes Berg <[email protected]>
Date: Fri, 2 Dec 2016 12:03:36 +0100
Subject: iwlwifi: mvm: avoid crash on restart w/o reserved queues
From: Johannes Berg <[email protected]>
commit 03c902bff524e0cf664737a33f2365f7837040bf upstream.
When the firmware restarts in a situation in which any station has no queue reserved anymore because that queue was used, the code will crash trying to access the queue_info array at the offset 255, which is far too big. Fix this by checking that a queue is actually reserved before writing its status.
--- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +4 -3
@@ -1144,9 +1144,10 @@ static void iwl_mvm_realloc_queues_after .frame_limit = IWL_FRAME_LIMIT, }; -/* Make sure reserved queue is still marked as such (or allocated) */ - mvm->queue_info[mvm_sta->reserved_queue].status = -IWL_MVM_QUEUE_RESERVED ; +/* Make sure reserved queue is still marked as such (if allocated) */ +if (mvm_sta->reserved_queue !=IEEE80211_INVAL_HW_QUEUE ) + mvm->queue_info[mvm_sta->reserved_queue].status = +IWL_MVM_QUEUE_RESERVED ;for (i =0 ; i <=IWL_MAX_TID_COUNT ; i++) {struct iwl_mvm_tid_data *tid_data = &mvm_sta->tid_data[i];
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/iwlwifi-mvm-avoid-crash-on-restart-w-o-reserved-queues.patch