ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-24 07:46:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpi: free mapping of rsdp before using rsdt/xsdt

Browse Source 
Fix #635
This commit is contained in:
Alexander Boettcher 2013-02-25 11:04:46 +01:00 committed by Norman Feske
parent 57b0c4dd52
commit 430d4064b8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os/src/drivers/acpi/acpi.cc
View File

@ -1060,7 +1060,8 @@ class Acpi_table
uint64_t xsdt;
uint8_t checksum_extended;
uint8_t reserved[3];
} __attribute__((packed)) * rsdp = reinterpret_cast<struct rsdp *>(ptr_rsdp);
} __attribute__((packed));
struct rsdp * rsdp = reinterpret_cast<struct rsdp *>(ptr_rsdp);
if (!rsdp) {
if (verbose)
@ -1076,16 +1077,20 @@ class Acpi_table
rsdp->revision, oem, rsdp->rsdt, rsdp->xsdt);
}
if (rsdp->xsdt && sizeof(addr_t) != sizeof(uint32_t)) {
addr_t const rsdt = rsdp->rsdt;
addr_t const xsdt = rsdp->xsdt;
/* drop rsdp io_mem mapping since rsdt/xsdt may overlap */
env()->parent()->close(io_mem);
if (xsdt && sizeof(addr_t) != sizeof(uint32_t)) {
/* running 64bit and xsdt is valid */
addr_t entries_count;
addr_t * entries;
{
Table_wrapper rsdt(rsdp->xsdt);
entries = rsdt.copy_entries(entries_count);
Table_wrapper table(xsdt);
entries = table.copy_entries(entries_count);
}
env()->parent()->close(io_mem);
_parse_tables(entries, entries_count);
if (entries)
@ -1096,11 +1101,10 @@ class Acpi_table
uint32_t * entries;
{
Table_wrapper rsdt(rsdp->rsdt);
entries = rsdt.copy_entries(entries_count);
Table_wrapper table(rsdt);
entries = table.copy_entries(entries_count);
}
env()->parent()->close(io_mem);
_parse_tables(entries, entries_count);
if (entries)