Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b662fe7 authored by Gavin Shan's avatar Gavin Shan Committed by David S. Miller
Browse files

net/cxgb4: Fix referencing freed adapter 



The adapter is freed before we check its flags. It was caused
by commit 144be3d9 ("net/cxgb4: Avoid disabling PCI device for
towice"). The problem was reported by Intel's "0-day" tool.

The patch fixes it to avoid reverting commit 144be3d9.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33d99113

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -6163,13 +6163,13 @@ static void remove_one(struct pci_dev *pdev) 
		iounmap(adapter->regs);

		iounmap(adapter->regs);

		if (!is_t4(adapter->params.chip))

		if (!is_t4(adapter->params.chip))

			iounmap(adapter->bar2);

			iounmap(adapter->bar2);

		kfree(adapter);

		pci_disable_pcie_error_reporting(pdev);

		pci_disable_pcie_error_reporting(pdev);

		if ((adapter->flags & DEV_ENABLED)) {

		if ((adapter->flags & DEV_ENABLED)) {

			pci_disable_device(pdev);

			pci_disable_device(pdev);

			adapter->flags &= ~DEV_ENABLED;

			adapter->flags &= ~DEV_ENABLED;

		}

		}

		pci_release_regions(pdev);

		pci_release_regions(pdev);

		kfree(adapter);

	} else

	} else

		pci_release_regions(pdev);

		pci_release_regions(pdev);

}

}