Skip to contentSkip to conversation

hippi: fix possible buffer overflow caused by bad DMA value in rr_start_xmit()

PATCH New Huai-Yuan Liu 1 participant 1 message Jun 25, 2024

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

PATCH v4 1/1 hippi: fix possible buffer overflow caused by bad DMA value in rr_start_xmit()

The value rrpriv->info->tx_ctrl is stored in DMA memory, and assigned to txctrl. However, txctrl->pi can be modified by malicious hardware at any time. Because txctrl->pi is assigned to index, buffer overflow may occur when the code "rrpriv->tx_skbuff[index]" is executed.

To address this issue, ensure index is checked.

Fixes f33a7251c825 ("hippi: switch from 'pci_' to 'dma_' API")

---
V2:
* In patch V2, we remove the first condition in if statement and use netdev_err() instead of printk().
Thanks Paolo Abeni for helpful advice.
V3:
* In patch V3, we stop the queue before return BUSY. Thanks to Jakub Kicinski for his advice.
V4:
* In patch V4, we revise the wording in the description. Thanks to Markus Elfring for pointing this out.

---
 drivers/net/hippi/rrunner.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/hippi/rrunner.c +6 -0
index aa8f828a0ae7..f4da342dd5cc 100644
@@ -1440,6 +1440,12 @@ static netdev_tx_t rr_start_xmit(struct sk_buff *skb,
 	txctrl = &rrpriv->info->tx_ctrl;
 
 	index = txctrl->pi;
+	if (index >= TX_RING_ENTRIES) {
+		netdev_err(dev, "invalid index value %02x\n", index);
+		netif_stop_queue(dev);
+		spin_unlock_irqrestore(&rrpriv->lock, flags);
+		return NETDEV_TX_BUSY;
+	}
 
 	rrpriv->tx_skbuff[index] = skb;
 	set_rraddr(&rrpriv->tx_ring[index].addr,
Signature · 1 line
2.34.1