| Message ID | e2d137375f8145bae328fb1b7b5b90954e85e39e.1485157068.git.agordeev@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jan 23, 2017 at 08:44:09AM +0100, Alexander Gordeev wrote: > Cc: Thomas Huth <thuth@redhat.com> > Cc: Andrew Jones <drjones@redhat.com> > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > --- > lib/pci.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/lib/pci.c b/lib/pci.c > index 7a3e505ab314..144bec755c8d 100644 > --- a/lib/pci.c > +++ b/lib/pci.c > @@ -35,6 +35,8 @@ uint32_t pci_bar_mask(uint32_t bar) > > uint32_t pci_bar_get(pcidevaddr_t dev, int bar_num) > { > + assert(bar_num >= 0 && bar_num < 6); > + > return pci_config_readl(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); > } > > @@ -45,6 +47,9 @@ phys_addr_t pci_bar_get_addr(pcidevaddr_t dev, int bar_num) > uint64_t addr = bar & mask; > phys_addr_t phys_addr; > > + if (!pci_bar_exists(dev, bar_num)) > + return INVALID_PHYS_ADDR; > + > if (pci_bar_is64(dev, bar_num)) > addr |= (uint64_t)pci_bar_get(dev, bar_num + 1) << 32; > > @@ -58,6 +63,8 @@ void pci_bar_set_addr(pcidevaddr_t dev, int bar_num, phys_addr_t addr) > { > int off = PCI_BASE_ADDRESS_0 + bar_num * 4; > > + assert(pci_bar_exists(dev, bar_num)); > + > pci_config_writel(dev, off, (uint32_t)addr); > > if (pci_bar_is64(dev, bar_num)) > @@ -91,6 +98,8 @@ phys_addr_t pci_bar_size(pcidevaddr_t dev, int bar_num) > { > uint32_t bar, size; > > + assert(pci_bar_is_valid(dev, bar_num)); If dropping patch 2, then we can replace this condition with (bar_num == 0 || !pci_bar_is64(dev, bar_num - 1)) > + > size = pci_bar_size_helper(dev, bar_num); > if (!size) > return 0; > -- > 1.8.3.1 >
diff --git a/lib/pci.c b/lib/pci.c index 7a3e505ab314..144bec755c8d 100644 --- a/lib/pci.c +++ b/lib/pci.c @@ -35,6 +35,8 @@ uint32_t pci_bar_mask(uint32_t bar) uint32_t pci_bar_get(pcidevaddr_t dev, int bar_num) { + assert(bar_num >= 0 && bar_num < 6); + return pci_config_readl(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); } @@ -45,6 +47,9 @@ phys_addr_t pci_bar_get_addr(pcidevaddr_t dev, int bar_num) uint64_t addr = bar & mask; phys_addr_t phys_addr; + if (!pci_bar_exists(dev, bar_num)) + return INVALID_PHYS_ADDR; + if (pci_bar_is64(dev, bar_num)) addr |= (uint64_t)pci_bar_get(dev, bar_num + 1) << 32; @@ -58,6 +63,8 @@ void pci_bar_set_addr(pcidevaddr_t dev, int bar_num, phys_addr_t addr) { int off = PCI_BASE_ADDRESS_0 + bar_num * 4; + assert(pci_bar_exists(dev, bar_num)); + pci_config_writel(dev, off, (uint32_t)addr); if (pci_bar_is64(dev, bar_num)) @@ -91,6 +98,8 @@ phys_addr_t pci_bar_size(pcidevaddr_t dev, int bar_num) { uint32_t bar, size; + assert(pci_bar_is_valid(dev, bar_num)); + size = pci_bar_size_helper(dev, bar_num); if (!size) return 0;
Cc: Thomas Huth <thuth@redhat.com> Cc: Andrew Jones <drjones@redhat.com> Signed-off-by: Alexander Gordeev <agordeev@redhat.com> --- lib/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+)