netdev - RE: [PATCH] net: rswitch: Avoid use-after-free in rswitch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID:
 <TYWPR01MB11030052165C031FD5FF843BED8DC2@TYWPR01MB11030.jpnprd01.prod.outlook.com>
Date: Tue, 2 Jul 2024 23:59:01 +0000
From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>
To: Radu Rendec <rrendec@...hat.com>, "David S. Miller" <davem@...emloft.net>,
	Paolo Abeni <pabeni@...hat.com>
CC: Niklas Söderlund
	<niklas.soderlund+renesas@...natech.se>, Jakub Kicinski <kuba@...nel.org>,
	Simon Horman <horms@...nel.org>, "netdev@...r.kernel.org"
	<netdev@...r.kernel.org>, "linux-renesas-soc@...r.kernel.org"
	<linux-renesas-soc@...r.kernel.org>
Subject: RE: [PATCH] net: rswitch: Avoid use-after-free in rswitch_poll()

Hello Radu,

> From: Radu Rendec, Sent: Wednesday, July 3, 2024 6:09 AM
> 
> 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.
> 
> Signed-off-by: Radu Rendec <rrendec@...hat.com>

Thank you very much for your patch!

Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>

Best regards,
Yoshihiro Shimoda

> ---
>  drivers/net/ethernet/renesas/rswitch.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
> index dcab638c57fe8..24c90d8f5a442 100644
> --- a/drivers/net/ethernet/renesas/rswitch.c
> +++ b/drivers/net/ethernet/renesas/rswitch.c
> @@ -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