Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d211e90e authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

mac80211: Fix robust management frame handling (MFP) 



Commit e34e09401ee9888dd662b2fca5d607794a56daf2 incorrectly removed
use of ieee80211_has_protected() from the management frame case and in
practice, made this validation drop all Action frames when MFP is
enabled. This should have only been done for frames with Protected
field set to zero.

Signed-off-by: default avatarJouni Malinen <j@w1.fi>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a124f3be

net/mac80211/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,8 @@ ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx) 
		return 0;



	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 */