From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 18 Dec 2020 18:47:17 +0000 (+0100)
Subject: mac80211: fix fast-rx encryption check
X-Git-Tag: v4.19.174~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b70798906c4c85314511cf6d5cae98385861fc07;p=users%2Fdwmw2%2Flinux.git

mac80211: fix fast-rx encryption check

[ Upstream commit 622d3b4e39381262da7b18ca1ed1311df227de86 ]

When using WEP, the default unicast key needs to be selected, instead of
the STA PTK.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20201218184718.93650-5-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5e56719f999c4..9e92e5e2336be 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4003,6 +4003,8 @@ void ieee80211_check_fast_rx(struct sta_info *sta)
 
 	rcu_read_lock();
 	key = rcu_dereference(sta->ptk[sta->ptk_idx]);
+	if (!key)
+		key = rcu_dereference(sdata->default_unicast_key);
 	if (key) {
 		switch (key->conf.cipher) {
 		case WLAN_CIPHER_SUITE_TKIP: