Commit ff765483 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Kalle Valo
Browse files

rtlwifi: rtl8192de: avoid accessing the data mapped to streaming DMA 



In rtl92de_tx_fill_cmddesc(), skb->data is mapped to streaming DMA on
line 667:
  dma_addr_t mapping = dma_map_single(..., skb->data, ...);

On line 669, 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 670:
  __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: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201119015205.12162-1-baijiaju1990@gmail.com
parent c7ba0ea0

drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c

+4 −2
Original line number Diff line number Diff line
@@ -664,12 +664,14 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);

	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);

	u8 fw_queue = QSLT_BEACON;

	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;

	__le32 *pdesc = (__le32 *)pdesc8;



	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");