mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-13 22:22:10 +00:00
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;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|