Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 06:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: Add checks to prevent config space overflow

Browse source 
PCIe config space has address range 0-4095. So do not allow reading from
addresses outside of this range. Lot of U-Boot drivers do not expect that
passed value is not in this range. PCI DM read function is extended to
fill read value to all ones or zeros when it fails as U-Boot callers
ignores return value.

Calling U-Boot command 'pci display.b 0.0.0 0 0x2000' now stops printing
config space at the end (before 0x1000 address).

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár 2022-07-03 12:48:06 +02:00 • committed by Tom Rini
parent aea087a665
commit d9f554b624
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/pci.c
View file

@ -358,6 +358,9 @@ static int pci_cfg_display(struct udevice *dev, ulong addr,
if (length == 0)
length = 0x40 / byte_size; /* Standard PCI config space */
if (addr >= 4096)
return 1;
/* Print the lines.
* once, and all accesses are with the specified bus width.
*/
@ -378,7 +381,10 @@ static int pci_cfg_display(struct udevice *dev, ulong addr,
rc = 1;
break;
}
} while (nbytes > 0);
} while (nbytes > 0 && addr < 4096);
if (rc == 0 && nbytes > 0)
return 1;
return (rc);
}
@ -390,6 +396,9 @@ static int pci_cfg_modify(struct udevice *dev, ulong addr, ulong size,
int nbytes;
ulong val;
if (addr >= 4096)
return 1;
/* Print the address, followed by value. Then accept input for
* the next value. A non-converted value exits.
*/
@ -427,7 +436,10 @@ static int pci_cfg_modify(struct udevice *dev, ulong addr, ulong size,
addr += size;
}
}
} while (nbytes);
} while (nbytes && addr < 4096);
if (nbytes)
return 1;
return 0;
}

10
drivers/pci/pci-uclass.c
View file

@ -286,6 +286,8 @@ int pci_bus_write_config(struct udevice *bus, pci_dev_t bdf, int offset,
ops = pci_get_ops(bus);
if (!ops->write_config)
return -ENOSYS;
if (offset < 0 || offset >= 4096)
return -EINVAL;
return ops->write_config(bus, bdf, offset, value, size);
}
@ -364,8 +366,14 @@ int pci_bus_read_config(const struct udevice *bus, pci_dev_t bdf, int offset,
struct dm_pci_ops *ops;
ops = pci_get_ops(bus);
if (!ops->read_config)
if (!ops->read_config) {
*valuep = pci_conv_32_to_size(~0, offset, size);
return -ENOSYS;
}
if (offset < 0 || offset >= 4096) {
*valuep = pci_conv_32_to_size(0, offset, size);
return -EINVAL;
}
return ops->read_config(bus, bdf, offset, valuep, size);
}