Skip to content

Commit 335e35b

Browse files
Krishna Kumarmpe
authored andcommitted
pci/hotplug/pnv_php: Fix hotplug driver crash on Powernv
The hotplug driver for powerpc (pci/hotplug/pnv_php.c) causes a kernel crash when we try to hot-unplug/disable the PCIe switch/bridge from the PHB. The crash occurs because although the MSI data structure has been released during disable/hot-unplug path and it has been assigned with NULL, still during unregistration the code was again trying to explicitly disable the MSI which causes the NULL pointer dereference and kernel crash. The patch fixes the check during unregistration path to prevent invoking pci_disable_msi/msix() since its data structure is already freed. Reported-by: Timothy Pearson <[email protected]> Closes: https://lore.kernel.org/all/1981605666.2142272.1703742465927.JavaMail.zimbra@raptorengineeringinc.com/ Acked-by: Bjorn Helgaas <[email protected]> Tested-by: Shawn Anastasio <[email protected]> Signed-off-by: Krishna Kumar <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://msgid.link/[email protected]
1 parent 45547a0 commit 335e35b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/pci/hotplug/pnv_php.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot,
4040
bool disable_device)
4141
{
4242
struct pci_dev *pdev = php_slot->pdev;
43-
int irq = php_slot->irq;
4443
u16 ctrl;
4544

4645
if (php_slot->irq > 0) {
@@ -59,7 +58,7 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot,
5958
php_slot->wq = NULL;
6059
}
6160

62-
if (disable_device || irq > 0) {
61+
if (disable_device) {
6362
if (pdev->msix_enabled)
6463
pci_disable_msix(pdev);
6564
else if (pdev->msi_enabled)

0 commit comments

Comments
 (0)