diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-09-15 14:36:09 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-15 12:51:46 -0500 |
| commit | d9a5f2f9c40247522c204aa142696694948cf0ce (patch) | |
| tree | 468e03f5cd1618217ef749cc92571134b77fe6d4 /drivers | |
| parent | 8babe12bfba735a55fd42e3ba3d0178eb3383c37 (diff) | |
| download | linux-stable-d9a5f2f9c40247522c204aa142696694948cf0ce.tar.gz linux-stable-d9a5f2f9c40247522c204aa142696694948cf0ce.tar.bz2 linux-stable-d9a5f2f9c40247522c204aa142696694948cf0ce.zip | |
iwlwifi: mvm: fix D3 firmware PN programming
[ Upstream commit 2cf5eb3ab7bb7f2e3a70edcef236cd62c87db030 ]
The code to send the RX PN data (for each TID) to the firmware
has a devastating bug: it overwrites the data for TID 0 with
all the TID data, leaving the remaining TIDs zeroed. This will
allow replays to actually be accepted by the firmware, which
could allow waking up the system.
Cc: <stable@vger.kernel.org> [3.1+]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/d3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c index c17be0fb7283..8da34a5d024f 100644 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c @@ -298,12 +298,12 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw, u8 *pn = seq.ccmp.pn; ieee80211_get_key_rx_seq(key, i, &seq); - aes_sc->pn = cpu_to_le64((u64)pn[5] | - ((u64)pn[4] << 8) | - ((u64)pn[3] << 16) | - ((u64)pn[2] << 24) | - ((u64)pn[1] << 32) | - ((u64)pn[0] << 40)); + aes_sc[i].pn = cpu_to_le64((u64)pn[5] | + ((u64)pn[4] << 8) | + ((u64)pn[3] << 16) | + ((u64)pn[2] << 24) | + ((u64)pn[1] << 32) | + ((u64)pn[0] << 40)); } data->use_rsc_tsc = true; break; |