net: ethernet: SP7021: fix a use after free of skb->len
Subsystems (4)
PATCH 1/1 net: ethernet: SP7021: fix a use after free of skb->len
The netif_receive_skb() function frees "skb" so store skb->len before it is freed.
--- drivers/net/ethernet/sunplus/spl2sw_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/sunplus/spl2sw_int.c +3 -1
@@ -29,6 +29,7 @@ int spl2sw_rx_poll(struct napi_struct *napi, int budget)u32 mask;int port;u32 cmd; +u32 len;/* Process high-priority queue and then low-priority queue. */ for (queue =0 ; queue <RX_DESC_QUEUE_NUM ; queue++) {
@@ -63,10 +64,11 @@ int spl2sw_rx_poll(struct napi_struct *napi, int budget)skb_put (skb, pkg_len -4 );/* Minus FCS */ skb->ip_summed =CHECKSUM_NONE ; skb->protocol =eth_type_trans (skb, comm->ndev[port]); + len = skb->len;netif_receive_skb (skb); stats->rx_packets++; - stats->rx_bytes += skb->len; + stats->rx_bytes += len;/* Allocate a new skb for receiving. */ new_skb =netdev_alloc_skb (NULL , comm->rx_desc_buff_size);
Signature · 1 line
2.35.1
Hi Dan,
Quoted 35 lines
The
netif_receive_skb()function frees "skb" so storeskb->lenbefore it is freed.Fixes fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")Signed-off-by Dan Carpenter <[email protected]>--- drivers/net/ethernet/sunplus/spl2sw_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/net/ethernet/sunplus/spl2sw_int.c +3
-2@@ -29,6 +29,7 @@ int spl2sw_rx_poll(struct napi_struct *napi, int budget)u32 mask;int port;u32 cmd; +u32 len;/* Process high-priority queue and then low-priority queue. */ for (queue =0 ; queue <RX_DESC_QUEUE_NUM ; queue++) {@@ -63,10 +64,11 @@ int spl2sw_rx_poll(struct napi_struct *napi, int budget)skb_put (skb, pkg_len -4 );/* Minus FCS */ skb->ip_summed =CHECKSUM_NONE ; skb->protocol =eth_type_trans (skb, comm->ndev[port]); + len = skb->len;netif_receive_skb (skb); stats->rx_packets++; - stats->rx_bytes += skb->len; + stats->rx_bytes += len;/* Allocate a new skb for receiving. */ new_skb =netdev_alloc_skb (NULL , comm->rx_desc_buff_size); --
Quoted 2 lines
2.35.1
Thanks a lot for fixing the bug.
Can we just move the statement "stats->rx_bytes += skb->len;" to before free skb?
For example,
skb_put(skb, pkg_len - 4); /* Minus FCS */ skb->ip_summed = CHECKSUM_NONE;skb->protocol = eth_type_trans(skb, comm->ndev[port]); stats->rx_packets++;stats->rx_bytes += skb->len; netif_receive_skb(skb);
/* Allocate a new skb for receiving. */new_skb = netdev_alloc_skb(NULL, comm->rx_desc_buff_size);
Best regards,
Wells
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 18 May 2022 20:37:15 +0300 you wrote:
The
netif_receive_skb()function frees "skb" so storeskb->lenbefore it is freed.Fixes fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")Signed-off-by Dan Carpenter <[email protected]>--- drivers/net/ethernet/sunplus/spl2sw_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Here is the summary with links:
- [net-next] net: ethernet: SP7021: fix a use after free of skb->len
https://git.kernel.org/netdev/net-next/c/df98714e432a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html