diff mbox

[U-Boot] pci: fix overflow in __pci_hose_bus_to_phys w/ large RAM

Message ID 1407794968-32106-1-git-send-email-swarren@wwwdotorg.org
State Accepted
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Stephen Warren Aug. 11, 2014, 10:09 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

If a 32-bit system has 2GB of RAM, and the base address of that RAM is
2GB, then start+size will overflow a 32-bit value (to a value of 0).

To avoid such an overflow, convert __pci_hose_bus_to_phys() to calculate
the offset of a bus address into a PCI region, rather than comparing a
bus address against the end of a PCI region.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 drivers/pci/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Anatolij Gustschin Aug. 14, 2014, 9:44 a.m. UTC | #1 
On Mon, 11 Aug 2014 16:09:28 -0600
Stephen Warren <swarren@wwwdotorg.org> wrote:

> From: Stephen Warren <swarren@nvidia.com>
> 
> If a 32-bit system has 2GB of RAM, and the base address of that RAM is
> 2GB, then start+size will overflow a 32-bit value (to a value of 0).
> 
> To avoid such an overflow, convert __pci_hose_bus_to_phys() to calculate
> the offset of a bus address into a PCI region, rather than comparing a
> bus address against the end of a PCI region.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
>  drivers/pci/pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied to u-boot-staging/agust@denx.de. thanks!

Anatolij
diff mbox

Patch

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ed113bf4022f..4fd9c532b3fb 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -323,7 +323,7 @@  int __pci_hose_bus_to_phys(struct pci_controller *hose,
 			continue;
 
 		if (bus_addr >= res->bus_start &&
-			bus_addr < res->bus_start + res->size) {
+			(bus_addr - res->bus_start) < res->size) {
 			*pa = (bus_addr - res->bus_start + res->phys_start);
 			return 0;
 		}