diff options
| author | Jouni Malinen <j@w1.fi> | 2010-03-29 23:35:23 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-31 14:46:42 -0400 |
| commit | ecbcd3243651ae8ac2b73a96c320992a4cf01c5b (patch) | |
| tree | 6bdb7da8ea5bdbffca4eb9246162e84dbc6b2b67 /net/mac80211/tx.c | |
| parent | e69e95dbecfb73f76765cdd16dadc6219a9068e3 (diff) | |
| download | linux-3.10-ecbcd3243651ae8ac2b73a96c320992a4cf01c5b.tar.gz linux-3.10-ecbcd3243651ae8ac2b73a96c320992a4cf01c5b.tar.bz2 linux-3.10-ecbcd3243651ae8ac2b73a96c320992a4cf01c5b.zip | |
mac80211: Fix BIP to be used only with group-addressed frames
BIP (part of IEEE 802.11w) is only supposed to be used with
group-addressed frames. We ended up picking it as a default mechanism
for every management whenever we did not have a STA entry for the
destination (e.g., for Probe Response to a STA that is not
associated). While the extra MMIE in the end of management frames
should not break frames completed in most cases, there is no point in
doing this. Fix key selection to pick the default management key only
if the frame is sent to multicast/broadcast address and the frame is a
robust management frame.
Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 08e1f17a422..350096afe79 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -513,6 +513,8 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) else if (tx->sta && (key = rcu_dereference(tx->sta->key))) tx->key = key; else if (ieee80211_is_mgmt(hdr->frame_control) && + is_multicast_ether_addr(hdr->addr1) && + ieee80211_is_robust_mgmt_frame(hdr) && (key = rcu_dereference(tx->sdata->default_mgmt_key))) tx->key = key; else if ((key = rcu_dereference(tx->sdata->default_key))) |