net: lan966x: improve error handle in lan966x_fdma_rx_get_frame()
PATCH 1/1 net: lan966x: improve error handle in lan966x_fdma_rx_get_frame()
Don't just print a warning. Clean up and return an error as well.
Fixes c8349639324a ("net: lan966x: Add FDMA functionality")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c +4 -1
@@ -425,7 +425,8 @@ static struct sk_buff *lan966x_fdma_rx_get_frame(struct lan966x_rx *rx)lan966x_ifh_get_src_port (skb->data, &src_port);lan966x_ifh_get_timestamp (skb->data, ×tamp); -WARN_ON (src_port >= lan966x->num_phys_ports); +if (WARN_ON (src_port >= lan966x->num_phys_ports)) + goto free_skb; skb->dev = lan966x->ports[src_port]->dev;skb_pull (skb,IFH_LEN *sizeof (u32));
@@ -449,6 +450,8 @@ static struct sk_buff *lan966x_fdma_rx_get_frame(struct lan966x_rx *rx)return skb; +free_skb: +kfree_skb (skb); unmap_page: dma_unmap_page(lan966x->dev, (dma_addr_t)db->dataptr, FDMA_DCB_STATUS_BLOCKL(db->status),
Signature · 1 line
2.35.1
Quoted 2 lines · Dan Carpenter
Don't just print a warning. Clean up and return an error as well.
Reviewed-by Horatiu Vultur <[email protected]>
Quoted 33 lines
Fixes c8349639324a ("net: lan966x: Add FDMA functionality")Signed-off-by Dan Carpenter <[email protected]>--- drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c +4
-2@@ -425,7 +425,8 @@ static struct sk_buff *lan966x_fdma_rx_get_frame(struct lan966x_rx *rx)lan966x_ifh_get_src_port (skb->data, &src_port);lan966x_ifh_get_timestamp (skb->data, ×tamp); -WARN_ON (src_port >= lan966x->num_phys_ports); +if (WARN_ON (src_port >= lan966x->num_phys_ports)) + goto free_skb; skb->dev = lan966x->ports[src_port]->dev;skb_pull (skb,IFH_LEN *sizeof (u32));@@ -449,6 +450,8 @@ static struct sk_buff *lan966x_fdma_rx_get_frame(struct lan966x_rx *rx)return skb; +free_skb: +kfree_skb (skb); unmap_page: dma_unmap_page(lan966x->dev, (dma_addr_t)db->dataptr, FDMA_DCB_STATUS_BLOCKL(db->status), --2.35.1
Signature · 1 line
/Horatiu
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 7 lines · On Fri, 26 Aug 2022 18:00:30 +0300 you wrote:
Don't just print a warning. Clean up and return an error as well.
Fixes c8349639324a ("net: lan966x: Add FDMA functionality")Signed-off-by Dan Carpenter <[email protected]>--- drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Here is the summary with links:
- [net] net: lan966x: improve error handle in lan966x_fdma_rx_get_frame()
https://git.kernel.org/netdev/net/c/13a9d08c2962
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html