diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-12-09 19:49:00 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:28 -0500 |
| commit | 897bed8b4320774e56f282cdc1cceb4d77442797 (patch) | |
| tree | 5b0a61044ec2a1b3e41d2435ed3dff652eebac82 | |
| parent | f33fdcf1b3a02fb92971a577d194ec6c579374af (diff) | |
| download | linux-3.10-897bed8b4320774e56f282cdc1cceb4d77442797.tar.gz linux-3.10-897bed8b4320774e56f282cdc1cceb4d77442797.tar.bz2 linux-3.10-897bed8b4320774e56f282cdc1cceb4d77442797.zip | |
mac80211: clean up RX key checks
Using the default key for "any key set" isn't
quite what we should do. It works, but with the
upcoming changes it makes life unnecessarily
complex, so do something better here and really
check for "any key".
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/rx.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 2fe8f5f8649..052789ef474 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -955,12 +955,31 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) * have been expected. */ struct ieee80211_key *key = NULL; + struct ieee80211_sub_if_data *sdata = rx->sdata; + int i; + if (ieee80211_is_mgmt(fc) && is_multicast_ether_addr(hdr->addr1) && (key = rcu_dereference(rx->sdata->default_mgmt_key))) rx->key = key; - else if ((key = rcu_dereference(rx->sdata->default_key))) - rx->key = key; + else { + if (rx->sta) { + for (i = 0; i < NUM_DEFAULT_KEYS; i++) { + key = rcu_dereference(rx->sta->gtk[i]); + if (key) + break; + } + } + if (!key) { + for (i = 0; i < NUM_DEFAULT_KEYS; i++) { + key = rcu_dereference(sdata->keys[i]); + if (key) + break; + } + } + if (key) + rx->key = key; + } return RX_CONTINUE; } else { u8 keyid; |