* [PATCH net v2 RESEND] net: ena: avoid double-counting TX DMA mappings on failure
@ 2026-11-15 11:42 Avi Weiss
2026-11-17 11:50 ` Daniel Machon
2026-11-18 1:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Avi Weiss @ 2026-11-15 11:42 UTC (permalink / raw)
To: netdev
Cc: akiyano, darinzon, andrew+netdev, davem, edumazet, kuba, pabeni,
evostrov
ena_tx_map_skb() increments tx_info->num_of_bufs after each successful
DMA mapping. If a later fragment mapping fails, the error path adds the
fragment index to this count before calling ena_unmap_tx_buff(). This
can cause DMA unmapping of buffers that were never mapped and
out-of-bounds access to the buffer array.
Remove the extra increment so that cleanup uses only the number of
successfully mapped buffers.
Discovered by comparing the in-tree ENA driver with Amazon's standalone
ENA driver.
Compiled with W=1 under x86_64 defconfig and allmodconfig configurations.
Fixes: 38005ca816a7 ("net: ena: add functions for handling Low Latency Queues in ena_netdev")
Signed-off-by: Evgeny Ostrovsky <evostrov@amazon.com>
Signed-off-by: Avi Weiss <thnkslprpt@gmail.com>
---
drivers/net/ethernet/amazon/ena/ena_netdev.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 7eb6456ed0d5..e0df628e1df6 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -2608,7 +2608,6 @@ static int ena_tx_map_skb(struct ena_ring *tx_ring,
tx_info->skb = NULL;
- tx_info->num_of_bufs += i;
ena_unmap_tx_buff(tx_ring, tx_info);
return -EINVAL;
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net v2 RESEND] net: ena: avoid double-counting TX DMA mappings on failure
2026-11-15 11:42 [PATCH net v2 RESEND] net: ena: avoid double-counting TX DMA mappings on failure Avi Weiss
@ 2026-11-17 11:50 ` Daniel Machon
2026-11-18 1:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Machon @ 2026-11-17 11:50 UTC (permalink / raw)
To: Avi Weiss
Cc: netdev, akiyano, darinzon, andrew+netdev, davem, edumazet, kuba,
pabeni, evostrov
> ena_tx_map_skb() increments tx_info->num_of_bufs after each successful
> DMA mapping. If a later fragment mapping fails, the error path adds the
> fragment index to this count before calling ena_unmap_tx_buff(). This
> can cause DMA unmapping of buffers that were never mapped and
> out-of-bounds access to the buffer array.
>
> Remove the extra increment so that cleanup uses only the number of
> successfully mapped buffers.
>
> Discovered by comparing the in-tree ENA driver with Amazon's standalone
> ENA driver.
>
> Compiled with W=1 under x86_64 defconfig and allmodconfig configurations.
> Fixes: 38005ca816a7 ("net: ena: add functions for handling Low Latency Queues in ena_netdev")
> Signed-off-by: Evgeny Ostrovsky <evostrov@amazon.com>
> Signed-off-by: Avi Weiss <thnkslprpt@gmail.com>
Seems like v2 was resend to add the "changes" section only ..
anyway, this version does what was asked for on v1 and the fix looks good to me.
Reviewed-by: Daniel Machon <daniel.machon@microchip.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net v2 RESEND] net: ena: avoid double-counting TX DMA mappings on failure
2026-11-15 11:42 [PATCH net v2 RESEND] net: ena: avoid double-counting TX DMA mappings on failure Avi Weiss
2026-11-17 11:50 ` Daniel Machon
@ 2026-11-18 1:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2026-11-18 1:40 UTC (permalink / raw)
To: Avi Weiss
Cc: netdev, akiyano, darinzon, andrew+netdev, davem, edumazet, kuba,
pabeni, evostrov
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Sun, 15 Nov 2026 13:42:34 +0200 you wrote:
> ena_tx_map_skb() increments tx_info->num_of_bufs after each successful
> DMA mapping. If a later fragment mapping fails, the error path adds the
> fragment index to this count before calling ena_unmap_tx_buff(). This
> can cause DMA unmapping of buffers that were never mapped and
> out-of-bounds access to the buffer array.
>
> Remove the extra increment so that cleanup uses only the number of
> successfully mapped buffers.
>
> [...]
Here is the summary with links:
- [net,v2,RESEND] net: ena: avoid double-counting TX DMA mappings on failure
https://git.kernel.org/netdev/net/c/6e9764591bcc
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-18 1:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-15 11:42 [PATCH net v2 RESEND] net: ena: avoid double-counting TX DMA mappings on failure Avi Weiss
2026-11-17 11:50 ` Daniel Machon
2026-11-18 1:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox