Unverified Commit 3b51e2f1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12625 net: ethernet: nixge: fix NULL dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DENKNCRWQFVGHIN3Z73AEG6UMXNUHYW5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRDM 
 
Link:https://gitee.com/openeuler/kernel/pulls/12625

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 4674555d 648eaf69

drivers/net/ethernet/ni/nixge.c

+15 −14
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ static void nixge_hw_dma_bd_release(struct net_device *ndev) 
	struct sk_buff *skb;

	int i;



	if (priv->rx_bd_v) {

		for (i = 0; i < RX_BD_NUM; i++) {

			phys_addr = nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i],

							     phys);
@@ -263,11 +264,11 @@ static void nixge_hw_dma_bd_release(struct net_device *ndev) 
			dev_kfree_skb(skb);

		}



	if (priv->rx_bd_v)

		dma_free_coherent(ndev->dev.parent,

				  sizeof(*priv->rx_bd_v) * RX_BD_NUM,

				  priv->rx_bd_v,

				  priv->rx_bd_p);

	}



	if (priv->tx_skb)

		devm_kfree(ndev->dev.parent, priv->tx_skb);