| From 211710ca74adf790b46ab3867fcce8047b573cd1 Mon Sep 17 00:00:00 2001 |
| From: Felix Fietkau <nbd@nbd.name> |
| Date: Sat, 29 Sep 2018 16:01:58 +0200 |
| Subject: mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys |
| |
| From: Felix Fietkau <nbd@nbd.name> |
| |
| commit 211710ca74adf790b46ab3867fcce8047b573cd1 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/mac80211/cfg.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/mac80211/cfg.c |
| +++ b/net/mac80211/cfg.c |
| @@ -386,7 +386,7 @@ static int ieee80211_add_key(struct wiph |
| 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: |
