mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
32621086c3
Fixes CVE-2022-47522
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit d54c91bd9a)
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Mon, 13 Mar 2023 12:02:58 +0100
|
|
Subject: [PATCH] wifi: iwlwifi: mvm: support flush on AP interfaces
|
|
|
|
Support TX flush on AP interfaces so that we will do a
|
|
proper flush for frames on the queue before keys are
|
|
removed.
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
Reviewed-by: Greenman, Gregory <gregory.greenman@intel.com>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
@@ -4791,9 +4791,6 @@ static void iwl_mvm_mac_flush(struct iee
|
|
return;
|
|
}
|
|
|
|
- if (vif->type != NL80211_IFTYPE_STATION)
|
|
- return;
|
|
-
|
|
/* Make sure we're done with the deferred traffic before flushing */
|
|
flush_work(&mvm->add_stream_wk);
|
|
|
|
@@ -4811,9 +4808,6 @@ static void iwl_mvm_mac_flush(struct iee
|
|
if (mvmsta->vif != vif)
|
|
continue;
|
|
|
|
- /* make sure only TDLS peers or the AP are flushed */
|
|
- WARN_ON(i != mvmvif->ap_sta_id && !sta->tdls);
|
|
-
|
|
if (drop) {
|
|
if (iwl_mvm_flush_sta(mvm, mvmsta, false))
|
|
IWL_ERR(mvm, "flush request fail\n");
|