Skip to contentSkip to conversation

wifi: rtw88: fix OOB read from firmware RX descriptor exceeding DMA buffer

PATCH Superseded Tristan Madani 2 participants 2 messages Apr 21 Realtek wireless driver (rtw88)

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 wifi: rtw88: fix OOB read from firmware RX descriptor exceeding DMA buffer

Quoted 1 line · Ping-Ke Shih

Since this is data (hot) path, I'd prefer unlikely(new_len > RTK_PCI_RX_BUF_SIZE).

Good point. v3 below adds unlikely().

Thanks Bitterblue for clarifying -- glad the patches are complementary.

---

From: Tristan Madani <[email protected]>
Subject: [PATCH v3] wifi: rtw88: fix OOB read from firmware RX descriptor exceeding DMA buffer

In rtw_pci_rx_napi(), new_len is computed as the sum of pkt_len (14-bit descriptor field, max 16383) and pkt_offset (drv_info_sz + shift, both firmware-controlled). The result can exceed RTK_PCI_RX_BUF_SIZE (11478), causing an out-of-bounds read from the pre-allocated DMA buffer when skb_put_data copies new_len bytes. The USB transport already validates this (rtw_usb_rx_data_put checks against RTW_USB_MAX_RECVBUF_SZ); the PCIe path does not.

Add a check that new_len does not exceed the DMA buffer size.

Fixes e3037485c68e ("rtw88: new Realtek 802.11ac driver")

---
Changes in v3:
- Wrap check in unlikely() since this is the RX hot path, per Ping-Ke Shih.

Changes in v2:
- Clarify field widths and maximum new_len derivation in commit message, per Ping-Ke Shih.

 drivers/net/wireless/realtek/rtw88/pci.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtw88/pci.c +5 -1
index XXXXXXX..XXXXXXX 100644
@@ -1078,6 +1078,11 @@ static int rtw_pci_rx_napi(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci,
 		new_len = pkt_stat.pkt_len + pkt_offset;
+		if (unlikely(new_len > RTK_PCI_RX_BUF_SIZE)) {
+			rtw_dbg(rtwdev, RTW_DBG_RX,
+				"oversized RX packet: %u\n", new_len);
+			goto next_rp;
+		}
 		new = dev_alloc_skb(new_len);
 		if (WARN_ONCE(!new, "rx routine starvation\n"))
 			goto next_rp;
--

2.43.0

#1 lore raw
Quoted 12 lines · Tristan Madani
Quoted 1 line · Ping-Ke Shih

Since this is data (hot) path, I'd prefer unlikely(new_len > RTK_PCI_RX_BUF_SIZE).

Good point. v3 below adds unlikely().

Thanks Bitterblue for clarifying -- glad the patches are complementary.

---

From: Tristan Madani <[email protected]>
Subject: [PATCH v3] wifi: rtw88: fix OOB read from firmware RX descriptor exceeding DMA buffer

This format doesn't work, you can't have a "preamble" section before a "---" separator, only a "footer" section _after_ a "---" separator (which doesn't go into the git history log.)

johannes