diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-09-29 16:01:58 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-10-01 09:13:48 +0200 |
commit | 211710ca74adf790b46ab3867fcce8047b573cd1 (patch) | |
tree | f8dd4f823f1511fb031490894eac5f37dd90937e /net/mac80211 | |
parent | 848e616e66d4592fe9afc40743d3504deb7632b4 (diff) | |
download | linux-stable-211710ca74adf790b46ab3867fcce8047b573cd1.tar.gz linux-stable-211710ca74adf790b46ab3867fcce8047b573cd1.tar.bz2 linux-stable-211710ca74adf790b46ab3867fcce8047b573cd1.zip |
mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys
key->sta is only valid after ieee80211_key_link, which is called later
in this function. Because of that, the IEEE80211_KEY_FLAG_RX_MGMT is
never set when management frame protection is enabled.
Fixes: e548c49e6dc6b ("mac80211: add key flag for management keys")
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index d25da0e66da1..5d22eda8a6b1 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -427,7 +427,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP_VLAN: /* Keys without a station are used for TX only */ - if (key->sta && test_sta_flag(key->sta, WLAN_STA_MFP)) + if (sta && test_sta_flag(sta, WLAN_STA_MFP)) key->conf.flags |= IEEE80211_KEY_FLAG_RX_MGMT; break; case NL80211_IFTYPE_ADHOC: |