mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-02 20:16:59 +00:00
025bd93f36
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>
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From: Wen Gong <wgong@codeaurora.org>
|
|
Date: Tue, 11 May 2021 20:02:55 +0200
|
|
Subject: [PATCH] ath10k: drop MPDU which has discard flag set by firmware
|
|
for SDIO
|
|
|
|
When the discard flag is set by the firmware for an MPDU, it should be
|
|
dropped. This allows a mitigation for CVE-2020-24588 to be implemented
|
|
in the firmware.
|
|
|
|
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
|
|
|
|
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
|
|
@@ -2312,6 +2312,11 @@ static bool ath10k_htt_rx_proc_rx_ind_hl
|
|
fw_desc = &rx->fw_desc;
|
|
rx_desc_len = fw_desc->len;
|
|
|
|
+ if (fw_desc->u.bits.discard) {
|
|
+ ath10k_dbg(ar, ATH10K_DBG_HTT, "htt discard mpdu\n");
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
/* I have not yet seen any case where num_mpdu_ranges > 1.
|
|
* qcacld does not seem handle that case either, so we introduce the
|
|
* same limitiation here as well.
|
|
--- a/drivers/net/wireless/ath/ath10k/rx_desc.h
|
|
+++ b/drivers/net/wireless/ath/ath10k/rx_desc.h
|
|
@@ -1282,7 +1282,19 @@ struct fw_rx_desc_base {
|
|
#define FW_RX_DESC_UDP (1 << 6)
|
|
|
|
struct fw_rx_desc_hl {
|
|
- u8 info0;
|
|
+ union {
|
|
+ struct {
|
|
+ u8 discard:1,
|
|
+ forward:1,
|
|
+ any_err:1,
|
|
+ dup_err:1,
|
|
+ reserved:1,
|
|
+ inspect:1,
|
|
+ extension:2;
|
|
+ } bits;
|
|
+ u8 info0;
|
|
+ } u;
|
|
+
|
|
u8 version;
|
|
u8 len;
|
|
u8 flags;
|