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

!10981 [sync] PR-10679: ibmvnic: Add tx check to prevent skb leak 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/10679 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JPY2M6XHO5HT7VJWPZPXTD3UAFBYUEQC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEMC 
 
Link:https://gitee.com/openeuler/kernel/pulls/10981

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents d666a201 6faf8738

drivers/net/ethernet/ibm/ibmvnic.c

+12 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,18 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
	    (tx_pool->consumer_index + 1) % tx_pool->num_buffers;



	tx_buff = &tx_pool->tx_buff[index];



	/* Sanity checks on our free map to make sure it points to an index

	 * that is not being occupied by another skb. If skb memory is

	 * not freed then we see congestion control kick in and halt tx.

	 */

	if (unlikely(tx_buff->skb)) {

		dev_warn_ratelimited(dev, "TX free map points to untracked skb (%s %d idx=%d)\n",

				     skb_is_gso(skb) ? "tso_pool" : "tx_pool",

				     queue_num, index);

		dev_kfree_skb_any(tx_buff->skb);

	}



	tx_buff->skb = skb;

	tx_buff->data_dma[0] = data_dma_addr;

	tx_buff->data_len[0] = skb->len;