summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-09-15 14:36:09 +0200
committerSasha Levin <sasha.levin@oracle.com>2015-11-15 12:51:45 -0500
commite660411f12ffd775cba9d908c8d2aaaf77a9bb81 (patch)
tree69516ce792bc6107e71aaec19e305db1c0795a10
parent9eb61e6a6e9e64ec4426529adf64a40e8082f829 (diff)
downloadlwn-e660411f12ffd775cba9d908c8d2aaaf77a9bb81.tar.gz
lwn-e660411f12ffd775cba9d908c8d2aaaf77a9bb81.zip
iwlwifi: dvm: fix D3 firmware PN programming
[ Upstream commit 5bd166872d8f99f156fac191299d24f828bb2348 ] 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>
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index cfe1293692fc..b51fb8977104 100644
--- a/drivers/net/wireless/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -1022,7 +1022,7 @@ static void iwlagn_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(
+ aes_sc[i].pn = cpu_to_le64(
(u64)pn[5] |
((u64)pn[4] << 8) |
((u64)pn[3] << 16) |