| Message ID | 20241015081755.31060-1-nbd@nbd.name (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 88806efc034a9830f483963326b99930ad519af1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: ethernet: mtk_eth_soc: fix memory corruption during fq dma init | expand |
On Tue, Oct 15, 2024 at 10:17:55AM +0200, Felix Fietkau wrote: > The loop responsible for allocating up to MTK_FQ_DMA_LENGTH buffers must > only touch as many descriptors, otherwise it ends up corrupting unrelated > memory. Fix the loop iteration count accordingly. > > Fixes: c57e55819443 ("net: ethernet: mtk_eth_soc: handle dma buffer size soc specific") > Signed-off-by: Felix Fietkau <nbd@nbd.name> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Tue, 15 Oct 2024 10:17:55 +0200 you wrote: > The loop responsible for allocating up to MTK_FQ_DMA_LENGTH buffers must > only touch as many descriptors, otherwise it ends up corrupting unrelated > memory. Fix the loop iteration count accordingly. > > Fixes: c57e55819443 ("net: ethernet: mtk_eth_soc: handle dma buffer size soc specific") > Signed-off-by: Felix Fietkau <nbd@nbd.name> > > [...] Here is the summary with links: - [net] net: ethernet: mtk_eth_soc: fix memory corruption during fq dma init https://git.kernel.org/netdev/net/c/88806efc034a You are awesome, thank you!
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 16ca427cf4c3..ed7313c10a05 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1171,7 +1171,7 @@ static int mtk_init_fq_dma(struct mtk_eth *eth) if (unlikely(dma_mapping_error(eth->dma_dev, dma_addr))) return -ENOMEM; - for (i = 0; i < cnt; i++) { + for (i = 0; i < len; i++) { struct mtk_tx_dma_v2 *txd; txd = eth->scratch_ring + (j * MTK_FQ_DMA_LENGTH + i) * soc->tx.desc_size;
The loop responsible for allocating up to MTK_FQ_DMA_LENGTH buffers must only touch as many descriptors, otherwise it ends up corrupting unrelated memory. Fix the loop iteration count accordingly. Fixes: c57e55819443 ("net: ethernet: mtk_eth_soc: handle dma buffer size soc specific") Signed-off-by: Felix Fietkau <nbd@nbd.name> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)