From: Greg Kroah-Hartman Date: Fri, 4 Aug 2023 10:42:23 +0000 (+0200) Subject: drop queue-4.19/ath10k-fix-tkip-michael-mic-verification-for-pcie.patch X-Git-Tag: v4.14.321~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=567abed340a8ddec432889617c713fd5496296b6;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/ath10k-fix-tkip-michael-mic-verification-for-pcie.patch --- diff --git a/queue-4.19/ath10k-fix-tkip-michael-mic-verification-for-pcie.patch b/queue-4.19/ath10k-fix-tkip-michael-mic-verification-for-pcie.patch deleted file mode 100644 index 5ba325ba398..00000000000 --- a/queue-4.19/ath10k-fix-tkip-michael-mic-verification-for-pcie.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0dc267b13f3a7e8424a898815dd357211b737330 Mon Sep 17 00:00:00 2001 -From: Wen Gong -Date: Tue, 11 May 2021 20:02:56 +0200 -Subject: ath10k: Fix TKIP Michael MIC verification for PCIe - -From: Wen Gong - -commit 0dc267b13f3a7e8424a898815dd357211b737330 upstream. - -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 -Signed-off-by: Jouni Malinen -Link: https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Ashwin Dayanand Kamat -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/net/wireless/ath/ath10k/htt_rx.c -+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c -@@ -1645,6 +1645,11 @@ static void ath10k_htt_rx_h_mpdu(struct - - skb_queue_walk(amsdu, msdu) { - 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); - -@@ -1662,6 +1667,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; - } - } -