From: Felix Fietkau Date: Sat, 29 Sep 2018 14:01:58 +0000 (+0200) Subject: mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys X-Git-Tag: v4.14.76~28 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9047696cb3f8d7cbe80592d231841699fd0246f2;p=users%2Fjedix%2Flinux-maple.git mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys 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 Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index b456b882a6ea..63558335e41e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -426,7 +426,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: