diff options
| author | Eyal Shapira | 2015-01-16 10:09:30 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach | 2015-01-20 07:47:16 +0100 |
| commit | 2cee4762c528a9bd2cdff793197bf591a2196c11 (patch) | |
| tree | 65fc2d1d2583eeadb45b8c75e7653d75cfb6de93 /drivers/net/wireless/iwlwifi | |
| parent | iwlwifi: mvm: abort scheduled scan upon RFKILL (diff) | |
| download | kernel-qcow2-linux-2cee4762c528a9bd2cdff793197bf591a2196c11.tar.gz kernel-qcow2-linux-2cee4762c528a9bd2cdff793197bf591a2196c11.tar.xz kernel-qcow2-linux-2cee4762c528a9bd2cdff793197bf591a2196c11.zip | |
iwlwifi: mvm: validate tid and sta_id in ba_notif
These are coming from the FW and are used to access arrays.
Bad values can cause an out of bounds access so discard
such ba_notifs and warn.
CC: <stable@vger.kernel.org> [3.10+]
Signed-off-by: Eyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index c59d07567d90..650a5f0b94c7 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -930,6 +930,11 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb, sta_id = ba_notif->sta_id; tid = ba_notif->tid; + if (WARN_ONCE(sta_id >= IWL_MVM_STATION_COUNT || + tid >= IWL_MAX_TID_COUNT, + "sta_id %d tid %d", sta_id, tid)) + return 0; + rcu_read_lock(); sta = rcu_dereference(mvm->fw_id_to_mac_id[sta_id]); |