diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-10-02 21:34:23 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-15 20:42:53 +0200 |
commit | 4045f72bcf3c293c7c5932ef001742d8bb5ded76 (patch) | |
tree | 55c85cefe2b663fe70d057fc7eadccb02b96c1c6 /drivers/net/wireless/brcm80211/brcmfmac/usb.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto... (diff) | |
download | linux-4045f72bcf3c293c7c5932ef001742d8bb5ded76.tar.xz linux-4045f72bcf3c293c7c5932ef001742d8bb5ded76.zip |
mac80211: check if key has TKIP type before updating IV
This patch fix corruption which can manifest itself by following crash
when switching on rfkill switch with rt2x00 driver:
https://bugzilla.redhat.com/attachment.cgi?id=615362
Pointer key->u.ccmp.tfm of group key get corrupted in:
ieee80211_rx_h_michael_mic_verify():
/* update IV in key information to be able to detect replays */
rx->key->u.tkip.rx[rx->security_idx].iv32 = rx->tkip_iv32;
rx->key->u.tkip.rx[rx->security_idx].iv16 = rx->tkip_iv16;
because rt2x00 always set RX_FLAG_MMIC_STRIPPED, even if key is not TKIP.
We already check type of the key in different path in
ieee80211_rx_h_michael_mic_verify() function, so adding additional
check here is reasonable.
Cc: stable@vger.kernel.org # 3.0+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/usb.c')
0 files changed, 0 insertions, 0 deletions