Skip to contentSkip to conversation

wifi: mt76: fix DMA read beyond mapped length

PATCH New Joshua Klinesmith 1 participant 4 messages Apr 6

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover wifi: mt76: fix DMA read beyond mapped length

tx_prepare_skb() in mt7615, mt7915, and mt7996 overrides buf[1].len to MT_CT_PARSE_LEN (72 bytes) for firmware header parsing, but dma_map_single() in dma.c only maps skb_headlen(skb) bytes. When the SKB is shorter than 72 bytes (e.g. a 54-byte TCP SYN), the DMA descriptor tells the hardware to read past the mapped region.

On systems without IOMMU this is silently ignored. On systems with SMMU (e.g. NXP LS1028A), the read past the page boundary triggers an SMMU translation fault.

Cap buf[1].len to min(MT_CT_PARSE_LEN, original_mapped_len) in all three drivers.

Joshua Klinesmith (3):
wifi: mt76: mt7615: fix DMA read beyond mapped length
wifi: mt76: mt7915: fix DMA read beyond mapped length
wifi: mt76: mt7996: fix DMA read beyond mapped length

 drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c | 2 +-
 drivers/net/wireless/mediatek/mt76/mt7915/mac.c     | 2 +-
 drivers/net/wireless/mediatek/mt76/mt7996/mac.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
#1 lore raw

PATCH 1/3 wifi: mt76: mt7615: fix DMA read beyond mapped length

tx_prepare_skb() overrides buf[1].len to MT_CT_PARSE_LEN (72) for firmware header parsing, but dma_map_single() only maps skb_headlen(skb) bytes. When the SKB is shorter than 72 bytes, the hardware reads past the DMA-mapped region, causing SMMU translation faults on IOMMU-enabled systems.

Cap the firmware parse length to the actual DMA-mapped length.

Fixes e90354e0452d ("mt76: mt7615: move core shared code in mt7615-common module")
---
 drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c +1 -1
index 53cb1eed1e4f..dc7128c46a72 100644
@@ -35,7 +35,7 @@ mt7615_write_fw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,
 
 	/* pass partial skb header to fw */
 	tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp);
-	tx_info->buf[1].len = MT_CT_PARSE_LEN;
+	tx_info->buf[1].len = min_t(u32, MT_CT_PARSE_LEN, tx_info->buf[1].len);
 	tx_info->buf[1].skip_unmap = true;
 	tx_info->nbuf = MT_CT_DMA_BUF_NUM;
 
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/3 wifi: mt76: mt7915: fix DMA read beyond mapped length

In reply to Joshua Klinesmith

Same bug as mt7615: buf[1].len is overridden to MT_CT_PARSE_LEN (72) but the DMA mapping may cover fewer bytes, causing SMMU faults when hardware reads past the mapped region.

Cap the firmware parse length to the actual DMA-mapped length.

Fixes c17780e7b21e ("mt76: mt7915: add txfree event v3")
---
 drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -1
index cec2c4208255..b66c440dbef3 100644
@@ -799,7 +799,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
 	tx_info->skb = NULL;
 
 	/* pass partial skb header to fw */
-	tx_info->buf[1].len = MT_CT_PARSE_LEN;
+	tx_info->buf[1].len = min_t(u32, MT_CT_PARSE_LEN, tx_info->buf[1].len);
 	tx_info->buf[1].skip_unmap = true;
 	tx_info->nbuf = MT_CT_DMA_BUF_NUM;
 
Signature · 1 line
2.43.0
#3 lore raw

PATCH 3/3 wifi: mt76: mt7996: fix DMA read beyond mapped length

In reply to Joshua Klinesmith

Same bug as mt7615/mt7915: buf[1].len is overridden to MT_CT_PARSE_LEN (72) but the DMA mapping may cover fewer bytes, causing SMMU faults when hardware reads past the mapped region.

Cap the firmware parse length to the actual DMA-mapped length.

Fixes 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
---
 drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +1 -1
index e2a83da3a09c..5c03dc163547 100644
@@ -1171,7 +1171,7 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
 	tx_info->skb = NULL;
 
 	/* pass partial skb header to fw */
-	tx_info->buf[1].len = MT_CT_PARSE_LEN;
+	tx_info->buf[1].len = min_t(u32, MT_CT_PARSE_LEN, tx_info->buf[1].len);
 	tx_info->buf[1].skip_unmap = true;
 	tx_info->nbuf = MT_CT_DMA_BUF_NUM;
 
Signature · 1 line
2.43.0