net: bcmasp: fix potential memory leak in bcmasp_xmit()

Wang Hai · kuba-moo · commit fed07d3eb8a8 · 2024-10-15T17:10:27.000-07:00
The bcmasp_xmit() returns NETDEV_TX_OK without freeing skb in case of mapping fails, add dev_kfree_skb() to fix it. Fixes: 490cb41 ("net: bcmasp: Add support for ASP2.0 Ethernet controller") Signed-off-by: Wang Hai <wanghai38@huawei.com> Acked-by: Florian Fainelli <florian.fainelli@broadcom.com> Link: https://patch.msgid.link/20241014145901.48940-1-wanghai38@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
@@ -322,6 +322,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, struct net_device *dev)
 			}
 			/* Rewind so we do not have a hole */
 			spb_index = intf->tx_spb_index;
+			dev_kfree_skb(skb);
 			return NETDEV_TX_OK;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff skb, struct net_device dev)`
`322`	`322`	`}`
`323`	`323`	`/* Rewind so we do not have a hole */`
`324`	`324`	`spb_index = intf->tx_spb_index;`
	`325`	`+ dev_kfree_skb(skb);`
`325`	`326`	`return NETDEV_TX_OK;`
`326`	`327`	`}`
`327`	`328`