GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 06:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc/eeh: Fix use-after-release of EEH driver

Browse source 
Correct two cases where eeh_pcid_get() is used to reference the driver's
module but the reference is dropped before the driver pointer is used.

In eeh_rmv_device() also refactor a little so that only two calls to
eeh_pcid_put() are needed, rather than three and the reference isn't
taken at all if it wasn't needed.

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Sam Bobroff 2018-05-25 13:11:30 +10:00 • committed by Michael Ellerman
parent 796b9f5b31
commit 46d4be41b9
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
arch/powerpc/kernel/eeh_driver.c
View file

@ -458,10 +458,12 @@ static void *eeh_add_virt_device(void *data, void *userdata)
driver = eeh_pcid_get(dev); driver = eeh_pcid_get(dev);
if (driver) { if (driver) {
if (driver->err_handler) {
eeh_pcid_put(dev); eeh_pcid_put(dev);
if (driver->err_handler)
return NULL; return NULL;
} }
eeh_pcid_put(dev);
}
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
pci_iov_add_virtfn(edev->physfn, pdn->vf_index); pci_iov_add_virtfn(edev->physfn, pdn->vf_index);
@ -497,18 +499,20 @@ static void *eeh_rmv_device(void *data, void *userdata)
if (eeh_dev_removed(edev)) if (eeh_dev_removed(edev))
return NULL; return NULL;
if (removed) {
if (eeh_pe_passed(edev->pe))
return NULL;
driver = eeh_pcid_get(dev); driver = eeh_pcid_get(dev);
if (driver) { if (driver) {
eeh_pcid_put(dev); if (driver->err_handler &&
if (removed &&
eeh_pe_passed(edev->pe))
return NULL;
if (removed &&
driver->err_handler &&
driver->err_handler->error_detected && driver->err_handler->error_detected &&
driver->err_handler->slot_reset) driver->err_handler->slot_reset) {
eeh_pcid_put(dev);
return NULL; return NULL;
} }
eeh_pcid_put(dev);
}
}
/* Remove it from PCI subsystem */ /* Remove it from PCI subsystem */
pr_debug("EEH: Removing %s without EEH sensitive driver\n", pr_debug("EEH: Removing %s without EEH sensitive driver\n",