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>
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From: Wen Gong <wgong@codeaurora.org>
|
|
Date: Tue, 11 May 2021 20:02:53 +0200
|
|
Subject: [PATCH] ath10k: drop fragments with multicast DA for PCIe
|
|
|
|
Fragmentation is not used with multicast frames. Discard unexpected
|
|
fragments with multicast DA. This fixes CVE-2020-26145.
|
|
|
|
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
|
|
@@ -1768,6 +1768,16 @@ static u64 ath10k_htt_rx_h_get_pn(struct
|
|
return pn;
|
|
}
|
|
|
|
+static bool ath10k_htt_rx_h_frag_multicast_check(struct ath10k *ar,
|
|
+ struct sk_buff *skb,
|
|
+ u16 offset)
|
|
+{
|
|
+ struct ieee80211_hdr *hdr;
|
|
+
|
|
+ hdr = (struct ieee80211_hdr *)(skb->data + offset);
|
|
+ return !is_multicast_ether_addr(hdr->addr1);
|
|
+}
|
|
+
|
|
static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar,
|
|
struct sk_buff *skb,
|
|
u16 peer_id,
|
|
@@ -1839,7 +1849,7 @@ static void ath10k_htt_rx_h_mpdu(struct
|
|
bool is_decrypted;
|
|
bool is_mgmt;
|
|
u32 attention;
|
|
- bool frag_pn_check = true;
|
|
+ bool frag_pn_check = true, multicast_check = true;
|
|
|
|
if (skb_queue_empty(amsdu))
|
|
return;
|
|
@@ -1946,13 +1956,20 @@ static void ath10k_htt_rx_h_mpdu(struct
|
|
0,
|
|
enctype);
|
|
|
|
- if (!frag_pn_check) {
|
|
- /* Discard the fragment with invalid PN */
|
|
+ if (frag)
|
|
+ multicast_check = ath10k_htt_rx_h_frag_multicast_check(ar,
|
|
+ msdu,
|
|
+ 0);
|
|
+
|
|
+ if (!frag_pn_check || !multicast_check) {
|
|
+ /* Discard the fragment with invalid PN or multicast DA
|
|
+ */
|
|
temp = msdu->prev;
|
|
__skb_unlink(msdu, amsdu);
|
|
dev_kfree_skb_any(msdu);
|
|
msdu = temp;
|
|
frag_pn_check = true;
|
|
+ multicast_check = true;
|
|
continue;
|
|
}
|
|
|