mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-25 05:47:00 +00:00
30 lines
951 B
Diff
30 lines
951 B
Diff
|
From b70798906c4c85314511cf6d5cae98385861fc07 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Fri, 18 Dec 2020 19:47:17 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
net/mac80211/rx.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
--- a/net/mac80211/rx.c
|
||
|
|
+++ b/net/mac80211/rx.c
|
||
|
|
@@ -4019,6 +4019,8 @@ void ieee80211_check_fast_rx(struct 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:
|