net: rswitch: Avoid use-after-free in rswitch_poll()
Subsystems (3)
PATCH 1/1 net: rswitch: Avoid use-after-free in rswitch_poll()
The use-after-free is actually in rswitch_tx_free(), which is inlined in rswitch_poll(). Since skb and gq->skbs[gq->dirty] are in fact the same pointer, the skb is first freed using dev_kfree_skb_any(), then the value in skb->len is used to update the interface statistics.
Let's move around the instructions to use skb->len before the skb is freed.
This bug is trivial to reproduce using KFENCE. It will trigger a splat every few packets. A simple ARP request or ICMP echo request is enough.
--- drivers/net/ethernet/renesas/rswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/renesas/rswitch.c +2 -2
@@ -871,13 +871,13 @@ static void rswitch_tx_free(struct net_device *ndev)dma_rmb (); skb = gq->skbs[gq->dirty];if (skb) { + rdev->ndev->stats.tx_packets++; + rdev->ndev->stats.tx_bytes += skb->len;dma_unmap_single (ndev->dev.parent, gq->unmap_addrs[gq->dirty], skb->len,DMA_TO_DEVICE );dev_kfree_skb_any (gq->skbs[gq->dirty]); gq->skbs[gq->dirty] =NULL ; - rdev->ndev->stats.tx_packets++; - rdev->ndev->stats.tx_bytes += skb->len; } desc->desc.die_dt =DT_EEMPTY ; }
Signature · 1 line
2.45.2
Hello Radu,
Quoted 7 lines
From: Radu Rendec, Sent: Wednesday, July 3, 2024 6:09 AM
The use-after-free is actually in
rswitch_tx_free(), which is inlined inrswitch_poll(). Sinceskbandgq->skbs[gq->dirty]are in fact the same pointer, the skb is first freed usingdev_kfree_skb_any(), then the value inskb->lenis used to update the interface statistics.
Quoted 7 lines
Let's move around the instructions to use
skb->lenbefore the skb is freed.This bug is trivial to reproduce using KFENCE. It will trigger a splat every few packets. A simple ARP request or ICMP echo request is enough.
Signed-off-by Radu Rendec <[email protected]>
Thank you very much for your patch!
Best regards,
Yoshihiro Shimoda
Quoted 26 lines
--- drivers/net/ethernet/renesas/rswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/renesas/rswitch.c +2
-3@@ -871,13 +871,13 @@ static void rswitch_tx_free(struct net_device *ndev)dma_rmb (); skb = gq->skbs[gq->dirty];if (skb) { + rdev->ndev->stats.tx_packets++; + rdev->ndev->stats.tx_bytes += skb->len;dma_unmap_single (ndev->dev.parent, gq->unmap_addrs[gq->dirty], skb->len,DMA_TO_DEVICE );dev_kfree_skb_any (gq->skbs[gq->dirty]); gq->skbs[gq->dirty] =NULL ; - rdev->ndev->stats.tx_packets++; - rdev->ndev->stats.tx_bytes += skb->len; } desc->desc.die_dt =DT_EEMPTY ; } --2.45.2
Hi Radu,
Quoted 5 lines · Radu Rendec
The use-after-free is actually in
rswitch_tx_free(), which is inlined inrswitch_poll(). Sinceskbandgq->skbs[gq->dirty]are in fact the same pointer, the skb is first freed usingdev_kfree_skb_any(), then the value inskb->lenis used to update the interface statistics.
Quoted 7 lines
Let's move around the instructions to use
skb->lenbefore the skb is freed.This bug is trivial to reproduce using KFENCE. It will trigger a splat every few packets. A simple ARP request or ICMP echo request is enough.
Signed-off-by Radu Rendec <[email protected]>
Quoted 27 lines
--- drivers/net/ethernet/renesas/rswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/renesas/rswitch.c +2
-2@@ -871,13 +871,13 @@ static void rswitch_tx_free(struct net_device *ndev)dma_rmb (); skb = gq->skbs[gq->dirty];if (skb) { + rdev->ndev->stats.tx_packets++; + rdev->ndev->stats.tx_bytes += skb->len;dma_unmap_single (ndev->dev.parent, gq->unmap_addrs[gq->dirty], skb->len,DMA_TO_DEVICE );dev_kfree_skb_any (gq->skbs[gq->dirty]); gq->skbs[gq->dirty] =NULL ; - rdev->ndev->stats.tx_packets++; - rdev->ndev->stats.tx_bytes += skb->len; } desc->desc.die_dt =DT_EEMPTY ; }Signature · 1 line
2.45.2
Signature · 2 lines
Kind Regards, Niklas Söderlund
Jakub Kicinski
maintainerQuoted 10 lines · On Tue, 2 Jul 2024 17:08:37 -0400 Radu Rendec wrote:
The use-after-free is actually in
rswitch_tx_free(), which is inlined inrswitch_poll(). Sinceskbandgq->skbs[gq->dirty]are in fact the same pointer, the skb is first freed usingdev_kfree_skb_any(), then the value inskb->lenis used to update the interface statistics.Let's move around the instructions to use
skb->lenbefore the skb is freed.This bug is trivial to reproduce using KFENCE. It will trigger a splat every few packets. A simple ARP request or ICMP echo request is enough.
Please remember to add a Fixes tag in the future. I added one when applying.
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 2 Jul 2024 17:08:37 -0400 you wrote:
The use-after-free is actually in
rswitch_tx_free(), which is inlined inrswitch_poll(). Sinceskbandgq->skbs[gq->dirty]are in fact the same pointer, the skb is first freed usingdev_kfree_skb_any(), then the value inskb->lenis used to update the interface statistics.Let's move around the instructions to use
skb->lenbefore the skb is freed.[...]
Here is the summary with links:
- net: rswitch: Avoid use-after-free in rswitch_poll()
https://git.kernel.org/netdev/net/c/9a0c28efeec6
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html