leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci: Handle failed calloc in decode_regions()

Browse Source 
Add a check for calloc() failing to allocate the requested memory.

Make decode_regions() return an error code.

Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Pierre-Clément Tosi <ptosi@google.com>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pierre-Clément Tosi 2022-05-19 17:48:30 +01:00 committed by Tom Rini
parent 26f981f295
commit f2ebaaa9f3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/pci/pci-uclass.c
View File

@ -954,7 +954,7 @@ int pci_bind_bus_devices(struct udevice *bus)
return 0; return 0;
} }
static void decode_regions(struct pci_controller *hose, ofnode parent_node, static int decode_regions(struct pci_controller *hose, ofnode parent_node,
ofnode node) ofnode node)
{ {
int pci_addr_cells, addr_cells, size_cells; int pci_addr_cells, addr_cells, size_cells;
@ -968,7 +968,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
prop = ofnode_get_property(node, "ranges", &len); prop = ofnode_get_property(node, "ranges", &len);
if (!prop) { if (!prop) {
debug("%s: Cannot decode regions\n", __func__); debug("%s: Cannot decode regions\n", __func__);
return; return -EINVAL;
} }
pci_addr_cells = ofnode_read_simple_addr_cells(node); pci_addr_cells = ofnode_read_simple_addr_cells(node);
@ -986,6 +986,8 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
max_regions = len / cells_per_record + CONFIG_NR_DRAM_BANKS; max_regions = len / cells_per_record + CONFIG_NR_DRAM_BANKS;
hose->regions = (struct pci_region *) hose->regions = (struct pci_region *)
calloc(1, max_regions * sizeof(struct pci_region)); calloc(1, max_regions * sizeof(struct pci_region));
if (!hose->regions)
return -ENOMEM;
for (i = 0; i < max_regions; i++, len -= cells_per_record) { for (i = 0; i < max_regions; i++, len -= cells_per_record) {
u64 pci_addr, addr, size; u64 pci_addr, addr, size;
@ -1053,7 +1055,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
/* Add a region for our local memory */ /* Add a region for our local memory */
bd = gd->bd; bd = gd->bd;
if (!bd) if (!bd)
return; return 0;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
if (bd->bi_dram[i].size) { if (bd->bi_dram[i].size) {
@ -1068,7 +1070,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
} }
} }
return; return 0;
} }
static int pci_uclass_pre_probe(struct udevice *bus) static int pci_uclass_pre_probe(struct udevice *bus)
@ -1097,7 +1099,10 @@ static int pci_uclass_pre_probe(struct udevice *bus)
/* For bridges, use the top-level PCI controller */ /* For bridges, use the top-level PCI controller */
if (!device_is_on_pci_bus(bus)) { if (!device_is_on_pci_bus(bus)) {
hose->ctlr = bus; hose->ctlr = bus;
decode_regions(hose, dev_ofnode(bus->parent), dev_ofnode(bus)); ret = decode_regions(hose, dev_ofnode(bus->parent),
dev_ofnode(bus));
if (ret)
return ret;
} else { } else {
struct pci_controller *parent_hose; struct pci_controller *parent_hose;