Commit 9ad607b4 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Jeff Kirsher

e100: Add a check after pci_pool_create to avoid null pointer dereference

The driver lacks the check of nic->cbs_pool after pci_pool_create
in e100_probe. When this function is failed, a null pointer dereference
occurs when pci_pool_alloc uses nic->cbs_pool in e100_alloc_cbs.
This patch adds a check and related error handling code to fix it.
Signed-off-by: default avatarJia-Ju Bai <baijiaju1990@163.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c23d92b8
...@@ -2967,6 +2967,11 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2967,6 +2967,11 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
nic->params.cbs.max * sizeof(struct cb), nic->params.cbs.max * sizeof(struct cb),
sizeof(u32), sizeof(u32),
0); 0);
if (!nic->cbs_pool) {
netif_err(nic, probe, nic->netdev, "Cannot create DMA pool, aborting\n");
err = -ENOMEM;
goto err_out_pool;
}
netif_info(nic, probe, nic->netdev, netif_info(nic, probe, nic->netdev,
"addr 0x%llx, irq %d, MAC addr %pM\n", "addr 0x%llx, irq %d, MAC addr %pM\n",
(unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
...@@ -2974,6 +2979,8 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2974,6 +2979,8 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0; return 0;
err_out_pool:
unregister_netdev(netdev);
err_out_free: err_out_free:
e100_free(nic); e100_free(nic);
err_out_iounmap: err_out_iounmap:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment