Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9047696c authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

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: e548c49e ("mac80211: add key flag for management keys")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ebd6558

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -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: