x86: fix memory leak in pvh_setup_acpi_xsdt

Switch to use goto style error handling to avoid leaking xsdt.

Coverity-ID: 1401535

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
Wei Liu authored and Andrew Cooper committed 2017-02-27 11:26:28 +00:00
1 parent f597c3f307
commit 2f63fa20fa
1 file changed
+14 -6
+14 -6
View File
@@ -2459,7 +2459,8 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
if ( !xsdt )
{
printk("Unable to allocate memory for XSDT table\n");
return -ENOMEM;
rc = -ENOMEM;
goto out;
}
/* Copy the native XSDT table header. */
@@ -2467,7 +2468,8 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
if ( !rsdp )
{
printk("Unable to map RSDP\n");
return -EINVAL;
rc = -EINVAL;
goto out;
}
xsdt_paddr = rsdp->xsdt_physical_address;
acpi_os_unmap_memory(rsdp, sizeof(*rsdp));
@@ -2475,7 +2477,8 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
if ( !table )
{
printk("Unable to map XSDT\n");
return -EINVAL;
rc = -EINVAL;
goto out;
}
xsdt->header = *table;
acpi_os_unmap_memory(table, sizeof(*table));
@@ -2505,7 +2508,8 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
if ( pvh_steal_ram(d, size, 0, GB(4), addr) )
{
printk("Unable to find guest RAM for XSDT\n");
return -ENOMEM;
rc = -ENOMEM;
goto out;
}
/* Mark this region as E820_ACPI. */
@@ -2516,11 +2520,15 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
if ( rc )
{
printk("Unable to copy XSDT into guest memory\n");
return rc;
goto out;
}
rc = 0;
out:
xfree(xsdt);
return 0;
return rc;
}
static int __init pvh_setup_acpi(struct domain *d, paddr_t start_info)
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.