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

!13223 e100: Fix possible use after free in e100_xmit_prepare 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zicheng Qu <quzicheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4LZ6JEUEWPQAUTJXBA2ABCPUETT4ASLC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYREC 
 
Link:https://gitee.com/openeuler/kernel/pulls/13223

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 69019a6d 6c868e0f

drivers/net/ethernet/intel/e100.c

+1 −4
Original line number Diff line number Diff line
@@ -1742,11 +1742,8 @@ static int e100_xmit_prepare(struct nic *nic, struct cb *cb, 
	dma_addr = pci_map_single(nic->pdev,

				  skb->data, skb->len, PCI_DMA_TODEVICE);

	/* If we can't map the skb, have the upper layer try later */

	if (pci_dma_mapping_error(nic->pdev, dma_addr)) {

		dev_kfree_skb_any(skb);

		skb = NULL;

	if (pci_dma_mapping_error(nic->pdev, dma_addr))

		return -ENOMEM;

	}



	/*

	 * Use the last 4 bytes of the SKB payload packet as the CRC, used for