mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-29 07:34:14 +00:00
3394af677c
The ath patch number is already large and adding other patch for ath11k will add more confusion with the patch numbering. Since the support of ath11k based device is imminent, prepare the mac80211 ath patch dir and split it in the dedicated ath5k, ath9k, ath10k and ath11k (empty for now). Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
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;
|
|
}
|
|
|