[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20240625075314.462593-1-qq810974084@gmail.com>
Date: Tue, 25 Jun 2024 15:53:14 +0800
From: Huai-Yuan Liu <qq810974084@...il.com>
To: jes@...ined-monkey.org,
davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com
Cc: linux-hippi@...site.dk,
netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
baijiaju1990@...il.com,
Huai-Yuan Liu <qq810974084@...il.com>
Subject: [PATCH V4] 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")
Signed-off-by: Huai-Yuan Liu <qq810974084@...il.com>
---
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(+)
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index aa8f828a0ae7..f4da342dd5cc 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -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,
--
2.34.1
Powered by blists - more mailing lists