ath10k: Fix TKIP Michael MIC verification for PCIe
PATCH 1/1 ath10k: Fix TKIP Michael MIC verification for PCIe
From: Wen Gong <[email protected]>
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
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/ath/ath10k/htt_rx.c +10 -0
@@ -1645,6 +1645,11 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, 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 ath10k *ar, 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 ; } }
Signature · 7 lines
2.35.6 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Greg Kroah-Hartman
maintainerQuoted 22 lines · Ashwin Dayanand Kamat
From: Wen Gong <[email protected]>
commit
0dc267b13f3a7e8424a898815dd357211b737330upstream.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 inieee80211_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
Signed-off-by Wen Gong <[email protected]>Signed-off-by Jouni Malinen <[email protected]>Link https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid open hereSigned-off-by Johannes Berg <[email protected]>Signed-off-by Ashwin Dayanand Kamat <[email protected]>
Quoted 4 lines
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Now queued up, thanks.
greg k-h
Greg Kroah-Hartman
maintainerQuoted 28 lines · Greg Kroah-Hartman
Quoted 22 lines · Ashwin Dayanand Kamat
From: Wen Gong <[email protected]>
commit
0dc267b13f3a7e8424a898815dd357211b737330upstream.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 inieee80211_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
Signed-off-by Wen Gong <[email protected]>Signed-off-by Jouni Malinen <[email protected]>Link https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid open hereSigned-off-by Johannes Berg <[email protected]>Signed-off-by Ashwin Dayanand Kamat <[email protected]>Quoted 4 lines
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Quoted 1 line
Now queued up, thanks.
Nope, breaks the build, how did you test this:
CC [M] drivers/net/wireless/ath/ath10k/htt_rx.odrivers/net/wireless/ath/ath10k/htt_rx.c: In function ‘ath10k_htt_rx_h_mpdu’:drivers/net/wireless/ath/ath10k/htt_rx.c:1649:21: error: ‘frag’ undeclared (first use in this function)
1649 | if (frag && !fill_crypt_header &&
| ^~~~
Quoted 2 lines
greg k-h