Commit aa11fc58 authored Mar 07, 2014 by Bjorn Helgaas

PCI: Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region()

When allocating space from a bus resource, i.e., from apertures leading to
this bus, make sure the entire resource type matches. The previous code
assumed the IORESOURCE_TYPE_BITS field was a bitmask with only a single bit
set, but this is not true. IORESOURCE_TYPE_BITS is really an enumeration,
and we have to check all the bits.

See 72dcb119 ("resources: Add register address resource type").

No functional change. If we used this path for allocating IRQs, DMA
channels, or bus numbers, this would fix a bug because those types are
indistinguishable when masked by IORESOURCE_IO | IORESOURCE_MEM. But we
don't, so this shouldn't make any difference.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent 6404e88e

drivers/pci/bus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static int pci_bus_alloc_from_region(struct pci_bus bus, struct resource res,
		struct resource *r, avail;
		resource_size_t max;

		type_mask \|= IORESOURCE_IO \| IORESOURCE_MEM;
		type_mask \|= IORESOURCE_TYPE_BITS;

		pci_bus_for_each_resource(bus, r, i) {
		if (!r)

Admin message