| Message ID | 20241015143424.71543-1-wanghai38@huawei.com (mailing list archive) |
|---|---|
| State | Under Review |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net] net: bcmasp: fix potential memory leak in bcmasp_xmit() | expand |
On Tue, Oct 15, 2024 at 10:34:24PM +0800, Wang Hai wrote: > The bcmasp_xmit() returns NETDEV_TX_OK without freeing skb > in case of mapping fails, add dev_consume_skb_any() to fix it. > > Fixes: 490cb412007d ("net: bcmasp: Add support for ASP2.0 Ethernet controller") > Signed-off-by: Wang Hai <wanghai38@huawei.com> There seems to be some confusion over in the thread for v1 of this patchset. Perhaps relating to several similar patches being in-flight at the same time. 1. Changes were requested by Florian 2. Jakub confirmed this concern 3. Florian Acked v1 patch 4. The bot sent a notificaiton that v1 had been applied But v1 is not in net-next. And I assume that 3 was intended for v2. From my point of view v2 addresses the concerns raised by Florian wrt v1. And, moreover, I agree this fix is correct. Reviewed-by: Simon Horman <horms@kernel.org> v2 is marked as Changes Requested in patchwork. But I suspect that is due to confusion around v1 as summarised above. So I am (hopefully) moving it back to Under Review.
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c index 82768b0e9026..8cc8efa8d1fb 100644 --- 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_consume_skb_any(skb); return NETDEV_TX_OK; }
The bcmasp_xmit() returns NETDEV_TX_OK without freeing skb in case of mapping fails, add dev_consume_skb_any() to fix it. Fixes: 490cb412007d ("net: bcmasp: Add support for ASP2.0 Ethernet controller") Signed-off-by: Wang Hai <wanghai38@huawei.com> --- v1->v2: replace dev_kfree_skb() with dev_consume_skb_any() drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 1 + 1 file changed, 1 insertion(+)