mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
5869423d21
From the patch series description: Several security issues in the 802.11 implementations were found by Mathy Vanhoef (New York University Abu Dhabi), who has published all the details at https://papers.mathyvanhoef.com/usenix2021.pdf Specifically, the following CVEs were assigned: * CVE-2020-24586 - Fragmentation cache not cleared on reconnection * CVE-2020-24587 - Reassembling fragments encrypted under different keys * CVE-2020-24588 - Accepting non-SPP A-MSDU frames, which leads to payload being parsed as an L2 frame under an A-MSDU bit toggling attack * CVE-2020-26139 - Forwarding EAPOL from unauthenticated sender * CVE-2020-26140 - Accepting plaintext data frames in protected networks * CVE-2020-26141 - Not verifying TKIP MIC of fragmented frames * CVE-2020-26142 - Processing fragmented frames as full frames * CVE-2020-26143 - Accepting fragmented plaintext frames in protected networks * CVE-2020-26144 - Always accepting unencrypted A-MSDU frames that start with RFC1042 header with EAPOL ethertype * CVE-2020-26145 - Accepting plaintext broadcast fragments as full frames * CVE-2020-26146 - Reassembling encrypted fragments with non-consecutive packet numbers * CVE-2020-26147 - Reassembling mixed encrypted/plaintext fragments In general, the scope of these attacks is that they may allow an attacker to * inject L2 frames that they can more or less control (depending on the vulnerability and attack method) into an otherwise protected network; * exfiltrate (some) network data under certain conditions, this is specific to the fragmentation issues. A subset of these issues is known to apply to the Linux IEEE 802.11 implementation (mac80211). Where it is affected, the attached patches fix the issues, even if not all of them reference the exact CVE IDs. In addition, driver and/or firmware updates may be necessary, as well as potentially more fixes to mac80211, depending on how drivers are using it. Specifically, for Intel devices, firmware needs to be updated to the most recently released versions (which was done without any reference to the security issues) to address some of the vulnerabilities. To have a single set of patches, I'm also including patches for the ath10k and ath11k drivers here. We currently don't have information about how other drivers are, if at all, affected. Signed-off-by: Felix Fietkau <nbd@nbd.name>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From: Wen Gong <wgong@codeaurora.org>
|
|
Date: Tue, 11 May 2021 20:02:56 +0200
|
|
Subject: [PATCH] ath10k: Fix TKIP Michael MIC verification for PCIe
|
|
|
|
TKIP Michael MIC was not verified properly for PCIe cases since the
|
|
validation steps in ieee80211_rx_h_michael_mic_verify() in mac80211 did
|
|
not get fully executed due to unexpected flag values in
|
|
ieee80211_rx_status.
|
|
|
|
Fix this by setting the flags property to meet mac80211 expectations for
|
|
performing Michael MIC validation there. This fixes CVE-2020-26141. It
|
|
does the same as ath10k_htt_rx_proc_rx_ind_hl() for SDIO which passed
|
|
MIC verification case. This applies only to QCA6174/QCA9377 PCIe.
|
|
|
|
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Wen Gong <wgong@codeaurora.org>
|
|
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
|
|
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
|
|
@@ -1974,6 +1974,11 @@ static void ath10k_htt_rx_h_mpdu(struct
|
|
}
|
|
|
|
ath10k_htt_rx_h_csum_offload(msdu);
|
|
+
|
|
+ if (frag && !fill_crypt_header &&
|
|
+ enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)
|
|
+ status->flag &= ~RX_FLAG_MMIC_STRIPPED;
|
|
+
|
|
ath10k_htt_rx_h_undecap(ar, msdu, status, first_hdr, enctype,
|
|
is_decrypted);
|
|
|
|
@@ -1991,6 +1996,11 @@ static void ath10k_htt_rx_h_mpdu(struct
|
|
|
|
hdr = (void *)msdu->data;
|
|
hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);
|
|
+
|
|
+ if (frag && !fill_crypt_header &&
|
|
+ enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)
|
|
+ status->flag &= ~RX_FLAG_IV_STRIPPED &
|
|
+ ~RX_FLAG_MMIC_STRIPPED;
|
|
}
|
|
}
|
|
|