* [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA
@ 2020-10-19 3:09 Jia-Ju Bai
2020-10-28 4:41 ` Pkshih
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jia-Ju Bai @ 2020-10-19 3:09 UTC (permalink / raw)
To: pkshih, kvalo, davem, kuba, straube.linux, Larry.Finger,
christophe.jaillet
Cc: linux-wireless, netdev, linux-kernel, Jia-Ju Bai
In rtl92ce_tx_fill_cmddesc(), skb->data is mapped to streaming DMA on
line 530:
dma_addr_t mapping = dma_map_single(..., skb->data, ...);
On line 533, skb->data is assigned to hdr after cast:
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
Then hdr->frame_control is accessed on line 534:
__le16 fc = hdr->frame_control;
This DMA access may cause data inconsistency between CPU and hardwre.
To fix this bug, hdr->frame_control is accessed before the DMA mapping.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index c0635309a92d..4165175cf5c0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -527,12 +527,12 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
u8 fw_queue = QSLT_BEACON;
__le32 *pdesc = (__le32 *)pdesc8;
- dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
- skb->len, DMA_TO_DEVICE);
-
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
__le16 fc = hdr->frame_control;
+ dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+ skb->len, DMA_TO_DEVICE);
+
if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
"DMA mapping error\n");
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA
2020-10-19 3:09 [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA Jia-Ju Bai
@ 2020-10-28 4:41 ` Pkshih
2020-11-07 11:44 ` Kalle Valo
[not found] ` <20201107114412.4BEEAC433C9@smtp.codeaurora.org>
2 siblings, 0 replies; 4+ messages in thread
From: Pkshih @ 2020-10-28 4:41 UTC (permalink / raw)
To: baijiaju1990, kvalo, davem, christophe.jaillet, kuba,
straube.linux, Larry.Finger
Cc: linux-wireless, netdev, linux-kernel
On Mon, 2020-10-19 at 11:09 +0800, Jia-Ju Bai wrote:
> In rtl92ce_tx_fill_cmddesc(), skb->data is mapped to streaming DMA on
> line 530:
> dma_addr_t mapping = dma_map_single(..., skb->data, ...);
>
> On line 533, skb->data is assigned to hdr after cast:
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
>
> Then hdr->frame_control is accessed on line 534:
> __le16 fc = hdr->frame_control;
>
> This DMA access may cause data inconsistency between CPU and hardwre.
>
> To fix this bug, hdr->frame_control is accessed before the DMA mapping.
>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> ---
> drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
> b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
> index c0635309a92d..4165175cf5c0 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
> @@ -527,12 +527,12 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
> u8 fw_queue = QSLT_BEACON;
> __le32 *pdesc = (__le32 *)pdesc8;
>
> - dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
> - skb->len, DMA_TO_DEVICE);
> -
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
> __le16 fc = hdr->frame_control;
>
> + dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
> + skb->len, DMA_TO_DEVICE);
> +
> if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
> rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
> "DMA mapping error\n");
The changes of the series patches are good to me.
But, please use 'rtlwifi: ' as subject prefix, like "rtlwifi: rtl8192ce: ...",
and send them as a patchset I think this would be better to maintainer.
Thank you
---
PK
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA
2020-10-19 3:09 [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA Jia-Ju Bai
2020-10-28 4:41 ` Pkshih
@ 2020-11-07 11:44 ` Kalle Valo
[not found] ` <20201107114412.4BEEAC433C9@smtp.codeaurora.org>
2 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2020-11-07 11:44 UTC (permalink / raw)
To: Jia-Ju Bai
Cc: pkshih, davem, kuba, straube.linux, Larry.Finger,
christophe.jaillet, linux-wireless, netdev, linux-kernel,
Jia-Ju Bai
Jia-Ju Bai <baijiaju1990@gmail.com> wrote:
> In rtl92ce_tx_fill_cmddesc(), skb->data is mapped to streaming DMA on
> line 530:
> dma_addr_t mapping = dma_map_single(..., skb->data, ...);
>
> On line 533, skb->data is assigned to hdr after cast:
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
>
> Then hdr->frame_control is accessed on line 534:
> __le16 fc = hdr->frame_control;
>
> This DMA access may cause data inconsistency between CPU and hardwre.
>
> To fix this bug, hdr->frame_control is accessed before the DMA mapping.
>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Like Ping said, use "rtlwifi:" prefix and have all rtlwifi patches in
the same patchset.
4 patches set to Changes Requested.
11843533 rtl8192ce: avoid accessing the data mapped to streaming DMA
11843541 rtl8192de: avoid accessing the data mapped to streaming DMA
11843553 rtl8723ae: avoid accessing the data mapped to streaming DMA
11843557 rtl8188ee: avoid accessing the data mapped to streaming DMA
--
https://patchwork.kernel.org/project/linux-wireless/patch/20201019030931.4796-1-baijiaju1990@gmail.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA
[not found] ` <20201107114412.4BEEAC433C9@smtp.codeaurora.org>
@ 2020-11-18 1:56 ` Jia-Ju Bai
0 siblings, 0 replies; 4+ messages in thread
From: Jia-Ju Bai @ 2020-11-18 1:56 UTC (permalink / raw)
To: Kalle Valo
Cc: pkshih, davem, kuba, straube.linux, Larry.Finger,
christophe.jaillet, linux-wireless, netdev, linux-kernel
On 2020/11/7 19:44, Kalle Valo wrote:
> Jia-Ju Bai <baijiaju1990@gmail.com> wrote:
>
>> In rtl92ce_tx_fill_cmddesc(), skb->data is mapped to streaming DMA on
>> line 530:
>> dma_addr_t mapping = dma_map_single(..., skb->data, ...);
>>
>> On line 533, skb->data is assigned to hdr after cast:
>> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
>>
>> Then hdr->frame_control is accessed on line 534:
>> __le16 fc = hdr->frame_control;
>>
>> This DMA access may cause data inconsistency between CPU and hardwre.
>>
>> To fix this bug, hdr->frame_control is accessed before the DMA mapping.
>>
>> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> Like Ping said, use "rtlwifi:" prefix and have all rtlwifi patches in
> the same patchset.
>
> 4 patches set to Changes Requested.
>
> 11843533 rtl8192ce: avoid accessing the data mapped to streaming DMA
> 11843541 rtl8192de: avoid accessing the data mapped to streaming DMA
> 11843553 rtl8723ae: avoid accessing the data mapped to streaming DMA
> 11843557 rtl8188ee: avoid accessing the data mapped to streaming DMA
>
Okay, I have sent v2 patches just now.
Please have a look, thank :)
Best wishes,
Jia-Ju Bai
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-18 1:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-19 3:09 [PATCH] rtl8192ce: avoid accessing the data mapped to streaming DMA Jia-Ju Bai
2020-10-28 4:41 ` Pkshih
2020-11-07 11:44 ` Kalle Valo
[not found] ` <20201107114412.4BEEAC433C9@smtp.codeaurora.org>
2020-11-18 1:56 ` Jia-Ju Bai
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 NNTP newsgroup(s).