| From a269606794503053dd07b7a757464ef74a09b447 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 18 Dec 2020 19:47:17 +0100 |
| Subject: mac80211: fix fast-rx encryption check |
| |
| From: Felix Fietkau <nbd@nbd.name> |
| |
| [ 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> |
| --- |
| net/mac80211/rx.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c |
| index 04ae9de55d74b..48c6aa337c925 100644 |
| --- a/net/mac80211/rx.c |
| +++ b/net/mac80211/rx.c |
| @@ -3823,6 +3823,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: |
| -- |
| 2.27.0 |
| |
