d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not crash when RSDT/XSDT contains an empty entry.

Browse Source 
Reported by:	Slawa Olhovchenkov <slw@zxy.spb.ru>
MFC after:	3 days
This commit is contained in:
jkim 2015-04-09 21:26:23 +00:00
parent 7d6898c7b9
commit 7952f98556
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
usr.sbin/acpi/acpidump/acpi.c
View File

@ -1085,17 +1085,10 @@ acpi_print_rsdt(ACPI_TABLE_HEADER *rsdp)
for (i = 0; i < entries; i++) {
if (i > 0)
printf(", ");
switch (addr_size) {
case 4:
if (addr_size == 4)
addr = le32toh(rsdt->TableOffsetEntry[i]);
break;
case 8:
else
addr = le64toh(xsdt->TableOffsetEntry[i]);
break;
default:
addr = 0;
}
assert(addr != 0);
printf("0x%08lx", addr);
}
printf(" }\n");
@ -1342,17 +1335,12 @@ acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp)
xsdt = (ACPI_TABLE_XSDT *)rsdp;
entries = (rsdp->Length - sizeof(ACPI_TABLE_HEADER)) / addr_size;
for (i = 0; i < entries; i++) {
switch (addr_size) {
case 4:
if (addr_size == 4)
addr = le32toh(rsdt->TableOffsetEntry[i]);
break;
case 8:
else
addr = le64toh(xsdt->TableOffsetEntry[i]);
break;
default:
assert((addr = 0));
}
if (addr == 0)
continue;
sdp = (ACPI_TABLE_HEADER *)acpi_map_sdt(addr);
if (acpi_checksum(sdp, sdp->Length)) {
warnx("RSDT entry %d (sig %.4s) is corrupt", i,
@ -1547,16 +1535,12 @@ sdt_from_rsdt(ACPI_TABLE_HEADER *rsdp, const char *sig, ACPI_TABLE_HEADER *last)
xsdt = (ACPI_TABLE_XSDT *)rsdp;
entries = (rsdp->Length - sizeof(ACPI_TABLE_HEADER)) / addr_size;
for (i = 0; i < entries; i++) {
switch (addr_size) {
case 4:
if (addr_size == 4)
addr = le32toh(rsdt->TableOffsetEntry[i]);
break;
case 8:
else
addr = le64toh(xsdt->TableOffsetEntry[i]);
break;
default:
assert((addr = 0));
}
if (addr == 0)
continue;
sdt = (ACPI_TABLE_HEADER *)acpi_map_sdt(addr);
if (last != NULL) {
if (sdt == last)