]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
mac80211: check if key has TKIP type before updating IV
authorStanislaw Gruszka <sgruszka@redhat.com>
Tue, 2 Oct 2012 19:34:23 +0000 (21:34 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Oct 2012 18:42:53 +0000 (14:42 -0400)
commit4045f72bcf3c293c7c5932ef001742d8bb5ded76
tree55c85cefe2b663fe70d057fc7eadccb02b96c1c6
parent3d02a9265c5414b07b372dde616174d3c89071a0
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>
net/mac80211/wpa.c