* [PATCH v4.19.y] ath10k: Fix TKIP Michael MIC verification for PCIe
@ 2023-08-02 10:22 Ashwin Dayanand Kamat
2023-08-04 10:28 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Ashwin Dayanand Kamat @ 2023-08-02 10:22 UTC (permalink / raw
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Wen Gong, Jouni Malinen,
Johannes Berg, davem, ath10k, linux-wireless, netdev, akaher,
vsirnapalli, tkundu, namit
From: Wen Gong <wgong@codeaurora.org>
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 <wgong@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Link: https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ashwin Dayanand Kamat <kashwindayan@vmware.com>
---
drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 0a7551dc0f94..b8bba6d99dba 100644
--- 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 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;
}
}
--
2.35.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4.19.y] ath10k: Fix TKIP Michael MIC verification for PCIe
2023-08-02 10:22 [PATCH v4.19.y] ath10k: Fix TKIP Michael MIC verification for PCIe Ashwin Dayanand Kamat
@ 2023-08-04 10:28 ` Greg Kroah-Hartman
2023-08-04 10:42 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2023-08-04 10:28 UTC (permalink / raw
To: Ashwin Dayanand Kamat
Cc: linux-kernel, stable, Wen Gong, Jouni Malinen, Johannes Berg,
davem, ath10k, linux-wireless, netdev, akaher, vsirnapalli,
tkundu, namit
On Wed, Aug 02, 2023 at 03:52:13PM +0530, Ashwin Dayanand Kamat wrote:
> From: Wen Gong <wgong@codeaurora.org>
>
> 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 <wgong@codeaurora.org>
> Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> Link: https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Signed-off-by: Ashwin Dayanand Kamat <kashwindayan@vmware.com>
> ---
> drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4.19.y] ath10k: Fix TKIP Michael MIC verification for PCIe
2023-08-04 10:28 ` Greg Kroah-Hartman
@ 2023-08-04 10:42 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2023-08-04 10:42 UTC (permalink / raw
To: Ashwin Dayanand Kamat
Cc: linux-kernel, stable, Wen Gong, Jouni Malinen, Johannes Berg,
davem, ath10k, linux-wireless, netdev, akaher, vsirnapalli,
tkundu, namit
On Fri, Aug 04, 2023 at 12:28:18PM +0200, Greg Kroah-Hartman wrote:
> On Wed, Aug 02, 2023 at 03:52:13PM +0530, Ashwin Dayanand Kamat wrote:
> > From: Wen Gong <wgong@codeaurora.org>
> >
> > 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 <wgong@codeaurora.org>
> > Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> > Link: https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > Signed-off-by: Ashwin Dayanand Kamat <kashwindayan@vmware.com>
> > ---
> > drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
>
> Now queued up, thanks.
Nope, breaks the build, how did you test this:
CC [M] drivers/net/wireless/ath/ath10k/htt_rx.o
drivers/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 &&
| ^~~~
>
> greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-04 10:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-02 10:22 [PATCH v4.19.y] ath10k: Fix TKIP Michael MIC verification for PCIe Ashwin Dayanand Kamat
2023-08-04 10:28 ` Greg Kroah-Hartman
2023-08-04 10:42 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).