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

Commit 7baab9ac authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Stefan Richter
Browse files

firewire: ohci: sanity-check MMIO resource 



pci_request_region() does not fail on resources that have not been
allocated by the BIOS or by the kernel, so to avoid accessing
registers that are not there, we have to check for this explicitly.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 9d60ef2b

drivers/firewire/ohci.c

+7 −0
Original line number Diff line number Diff line
@@ -3545,6 +3545,13 @@ static int __devinit pci_probe(struct pci_dev *dev, 


	INIT_WORK(&ohci->bus_reset_work, bus_reset_work);



	if (!(pci_resource_flags(dev, 0) & IORESOURCE_MEM) ||

	    pci_resource_len(dev, 0) < OHCI1394_REGISTER_SIZE) {

		dev_err(&dev->dev, "invalid MMIO resource\n");

		err = -ENXIO;

		goto fail_disable;

	}



	err = pci_request_region(dev, 0, ohci_driver_name);

	if (err) {

		dev_err(&dev->dev, "MMIO resource unavailable\n");