Commit 05a2538f authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

s390/pci: Fix duplicate pci_dev_put() in disable_slot() when PF has child VFs 



With commit bcb5d6c7 ("s390/pci: introduce lock to synchronize state
of zpci_dev's") the code to ignore power off of a PF that has child VFs
was changed from a direct return to a goto to the unlock and
pci_dev_put() section. The change however left the existing pci_dev_put()
untouched resulting in a doubple put. This can subsequently cause a use
after free if the struct pci_dev is released in an unexpected state.
Fix this by removing the extra pci_dev_put().

Cc: stable@vger.kernel.org
Fixes: bcb5d6c7 ("s390/pci: introduce lock to synchronize state of zpci_dev's")
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarGerd Bayer <gbayer@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 42420c50

drivers/pci/hotplug/s390_pci_hpc.c

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) 


	pdev = pci_get_slot(zdev->zbus->bus, zdev->devfn);

	if (pdev && pci_num_vf(pdev)) {

		pci_dev_put(pdev);

		rc = -EBUSY;

		goto out;

	}