mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-24 21:02:35 +00:00
817bd951c9
* enable firstcontact by default * ehance wpa3 support * backport krak2 mitigationg to ath11k * add onboarding ssid * donot re-request DHCP upon topology changes Signed-off-by: John Crispin <john@phrozen.org>
85 lines
3.2 KiB
Diff
85 lines
3.2 KiB
Diff
From 0e23a88c63d6abbeaef8ec90bd29584b7c5068bd Mon Sep 17 00:00:00 2001
|
|
From: Sriram R <srirrama@codeaurora.org>
|
|
Date: Thu, 10 Dec 2020 14:20:50 +0530
|
|
Subject: [PATCH] ath11k: Clear the fragment cache during key install
|
|
|
|
Currently the fragment cache setup during peer assoc is
|
|
cleared during peer delete. In case a key reinstallation
|
|
happens with the same peer, possibilitites are same fragment cache
|
|
where some fragments were added before key installation could be clubbed
|
|
with fragments received after. In ideal cases where
|
|
this could result in wrong PN since we expect all fragments to
|
|
have incrementing PN, this behavior could be explioted
|
|
to mix fragments of different data resulting in a proper
|
|
unintended reassembled packet to be passed up the stack.
|
|
|
|
Signed-off-by: Sriram R <srirrama@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ath/ath11k/dp_rx.c | 19 +++++++++++++++++++
|
|
drivers/net/wireless/ath/ath11k/dp_rx.h | 1 +
|
|
drivers/net/wireless/ath/ath11k/mac.c | 6 ++++++
|
|
3 files changed, 26 insertions(+)
|
|
|
|
diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
|
|
index 0fa25c1..06bbd6e 100644
|
|
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
|
|
@@ -844,6 +844,25 @@ static void ath11k_dp_rx_frags_cleanup(struct dp_rx_tid *rx_tid, bool rel_link_d
|
|
__skb_queue_purge(&rx_tid->rx_frags);
|
|
}
|
|
|
|
+void ath11k_peer_frags_flush(struct ath11k *ar, struct ath11k_peer *peer)
|
|
+{
|
|
+ struct dp_rx_tid *rx_tid;
|
|
+ int i;
|
|
+
|
|
+ lockdep_assert_held(&ar->ab->base_lock);
|
|
+
|
|
+ for (i = 0; i <= IEEE80211_NUM_TIDS; i++) {
|
|
+ rx_tid = &peer->rx_tid[i];
|
|
+
|
|
+ spin_unlock_bh(&ar->ab->base_lock);
|
|
+ del_timer_sync(&rx_tid->frag_timer);
|
|
+ spin_lock_bh(&ar->ab->base_lock);
|
|
+
|
|
+ ath11k_dp_rx_frags_cleanup(rx_tid, true);
|
|
+
|
|
+ }
|
|
+}
|
|
+
|
|
void ath11k_peer_rx_tid_cleanup(struct ath11k *ar, struct ath11k_peer *peer)
|
|
{
|
|
struct dp_rx_tid *rx_tid;
|
|
diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.h b/drivers/net/wireless/ath/ath11k/dp_rx.h
|
|
index f005ded..732f9a7 100644
|
|
--- a/drivers/net/wireless/ath/ath11k/dp_rx.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.h
|
|
@@ -68,6 +68,7 @@ int ath11k_dp_peer_rx_pn_replay_config(struct ath11k_vif *arvif,
|
|
const u8 *peer_addr,
|
|
enum set_key_cmd key_cmd,
|
|
struct ieee80211_key_conf *key);
|
|
+void ath11k_peer_frags_flush(struct ath11k *ar, struct ath11k_peer *peer);
|
|
void ath11k_peer_rx_tid_cleanup(struct ath11k *ar, struct ath11k_peer *peer);
|
|
void ath11k_peer_rx_tid_delete(struct ath11k *ar,
|
|
struct ath11k_peer *peer, u8 tid);
|
|
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
|
|
index 4c88eab..91d645e 100644
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -3707,6 +3707,12 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
|
*/
|
|
spin_lock_bh(&ab->base_lock);
|
|
peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr);
|
|
+
|
|
+ /* flush the fragments cache during key (re)install to
|
|
+ * ensure all frags in the new frag list belong to the same key.
|
|
+ */
|
|
+ if (peer && cmd == SET_KEY)
|
|
+ ath11k_peer_frags_flush(ar, peer);
|
|
spin_unlock_bh(&ab->base_lock);
|
|
|
|
if (!peer) {
|
|
--
|
|
2.7.4
|
|
|