GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/amd/pi,sb/amd/sr5650: Remove unnecessary allocation 

add_ivrs_device_entries() is a recursive function, and each recursive
call is passed a pointer to a root_level variable declared outside the
function. In an attempt to make the function self-contained, the initial
call is made with the root_level pointer set to NULL, and then the
function attempts to detect this and allocate a root_level variable for
the rest of the calls. This makes memory management very tricky - for
example, the pi code incorrectly attempts to free the root_level
variable at the end of *each* recursive call, which only avoids being a
double-free because free() in coreboot is currently a no-op. Let's
keep life simple and declare root_level as a local variable outside the
first function call instead.

Change-Id: Ifd63ee368fb89345b9b42ccb86cebcca64f32ac8
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Found-by: Coverity CID 1362811
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34387
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jacob Garber 2019-07-17 11:47:19 -06:00 committed by Patrick Georgi
parent 4f387e1240
commit 293e6a96a9
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/northbridge/amd/pi/00730F01/northbridge.c
View File

@ -491,11 +491,6 @@ static void add_ivrs_device_entries(struct device *parent, struct device *dev,
unsigned int header_type; unsigned int header_type;
unsigned int is_pcie; unsigned int is_pcie;
if (!root_level) {
root_level = malloc(sizeof(int8_t));
*root_level = -1;
}
if (dev->path.type == DEVICE_PATH_PCI) { if (dev->path.type == DEVICE_PATH_PCI) {
if ((dev->bus->secondary == 0x0) && if ((dev->bus->secondary == 0x0) &&
@ -536,8 +531,6 @@ static void add_ivrs_device_entries(struct device *parent, struct device *dev,
sibling->sibling) sibling->sibling)
add_ivrs_device_entries(dev, sibling, depth + 1, depth, add_ivrs_device_entries(dev, sibling, depth + 1, depth,
root_level, current, length); root_level, current, length);
free(root_level);
} }
unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current) unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current)
@ -643,7 +636,8 @@ static unsigned long acpi_fill_ivrs(acpi_ivrs_t *ivrs, unsigned long current)
current += 8; current += 8;
/* Describe PCI devices */ /* Describe PCI devices */
add_ivrs_device_entries(NULL, all_devices, 0, -1, NULL, &current, int8_t root_level = -1;
add_ivrs_device_entries(NULL, all_devices, 0, -1, &root_level, &current,
&ivrs->ivhd.length); &ivrs->ivhd.length);
/* Describe IOAPICs */ /* Describe IOAPICs */

13
src/southbridge/amd/sr5650/sr5650.c
View File

@ -725,13 +725,6 @@ static void add_ivrs_device_entries(struct device *parent, struct device *dev,
struct device *sibling; struct device *sibling;
struct bus *link; struct bus *link;
if (!root_level) {
root_level = malloc(sizeof(int8_t));
if (root_level == NULL)
die("Error: Could not allocate a byte!\n");
*root_level = -1;
}
if ((dev->path.type == DEVICE_PATH_PCI) && if ((dev->path.type == DEVICE_PATH_PCI) &&
(dev->bus->secondary == 0x0) && (dev->path.pci.devfn == 0x0)) (dev->bus->secondary == 0x0) && (dev->path.pci.devfn == 0x0))
*root_level = depth; *root_level = depth;
@ -798,9 +791,6 @@ static void add_ivrs_device_entries(struct device *parent, struct device *dev,
sibling = sibling->sibling) sibling = sibling->sibling)
add_ivrs_device_entries(dev, sibling, depth + 1, add_ivrs_device_entries(dev, sibling, depth + 1,
depth, root_level, current, length); depth, root_level, current, length);
if (depth == 0)
free(root_level);
} }
unsigned long acpi_fill_mcfg(unsigned long current) unsigned long acpi_fill_mcfg(unsigned long current)
@ -879,7 +869,8 @@ static unsigned long acpi_fill_ivrs(acpi_ivrs_t *ivrs, unsigned long current)
current += 8; current += 8;
/* Describe PCI devices */ /* Describe PCI devices */
add_ivrs_device_entries(NULL, all_devices, 0, -1, NULL, &current, int8_t root_level = -1;
add_ivrs_device_entries(NULL, all_devices, 0, -1, &root_level, &current,
&ivrs->ivhd.length); &ivrs->ivhd.length);
/* Describe IOAPICs */ /* Describe IOAPICs */