Commit fa83a218 authored Mar 29, 2010 by Jouni Malinen Committed by John W. Linville Mar 31, 2010

mac80211: Fix dropping of unprotected robust multicast frames



When selecting the RX key for group-addressed robust management
frames, we do not actually select any BIP key if the frame is
unprotected (since we cannot find the key index from MMIE). This
results in the drop_unencrypted check in failing to drop the frame. It
is enough to verify that we have a STA entry for the transmitter and
that MFP is enabled for that STA; we do not need to check rx->key
here. This fixes BIP processing for unprotected, group-addressed,
robust management frames.

Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent ecbcd324

net/mac80211/rx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1421,8 +1421,7 @@ ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx)
		return -EACCES;
		/* BIP does not use Protected field, so need to check MMIE */
		if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) &&
		ieee80211_get_mmie_keyidx(rx->skb) < 0 &&
		rx->key))
		ieee80211_get_mmie_keyidx(rx->skb) < 0))
		return -EACCES;
		/*
		* When using MFP, Action frames are not allowed prior to

Admin message