mac80211: Fix robust management frame handling (MFP)

Commit Message

Jouni Malinen March 29, 2010, 5:29 a.m. UTC

None

Patch

--- wireless-testing.orig/net/mac80211/rx.c	2010-03-28 22:14:33.000000000 -0700
+++ wireless-testing/net/mac80211/rx.c	2010-03-28 22:26:33.000000000 -0700
@@ -1404,7 +1404,8 @@  ieee80211_drop_unencrypted_mgmt(struct i
 		return res;
 
 	if (rx->sta && test_sta_flags(rx->sta, WLAN_STA_MFP)) {
-		if (unlikely(ieee80211_is_unicast_robust_mgmt_frame(rx->skb) &&
+		if (unlikely(!ieee80211_has_protected(fc) &&
+			     ieee80211_is_unicast_robust_mgmt_frame(rx->skb) &&
 			     rx->key))
 			return -EACCES;
 		/* BIP does not use Protected field, so need to check MMIE */