| Message ID | 1668525024-38409-2-git-send-email-zhangchangzhong@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | three fixes for nixge driver | expand |
Zhang Changzhong <zhangchangzhong@huawei.com> : > The nixge_start_xmit() returns NETDEV_TX_OK but does not free skb in > case of dma_map_single() fails, which leads to memory leak. > > Fix it by adding dev_kfree_skb_any() when dma_map_single() fails. > > Fixes: 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > --- > drivers/net/ethernet/ni/nixge.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Francois Romieu <romieu@fr.zoreil.com>
diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 19d043b..d8cd520 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -526,8 +526,10 @@ static netdev_tx_t nixge_start_xmit(struct sk_buff *skb, cur_phys = dma_map_single(ndev->dev.parent, skb->data, skb_headlen(skb), DMA_TO_DEVICE); - if (dma_mapping_error(ndev->dev.parent, cur_phys)) + if (dma_mapping_error(ndev->dev.parent, cur_phys)) { + dev_kfree_skb_any(skb); goto drop; + } nixge_hw_dma_bd_set_phys(cur_p, cur_phys); cur_p->cntrl = skb_headlen(skb) | XAXIDMA_BD_CTRL_TXSOF_MASK;
The nixge_start_xmit() returns NETDEV_TX_OK but does not free skb in case of dma_map_single() fails, which leads to memory leak. Fix it by adding dev_kfree_skb_any() when dma_map_single() fails. Fixes: 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- drivers/net/ethernet/ni/nixge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)