i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* acpi_init() could pass a NULL "rsdp" to acpi_check_rsdt() which would happily

Browse Source 
dereference it no matter what. This fixes CID 1282.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27392 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-09-09 21:30:37 +00:00
parent 3b1f1178aa
commit 123786187c
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/bios_ia32/acpi.cpp
+23 -16
View File
@@ -12,11 +12,12 @@
#include "acpi.h" #include "acpi.h"
#include "mmu.h" #include "mmu.h"
#include <string.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <arch/x86/arch_acpi.h> #include <arch/x86/arch_acpi.h>
#include <string.h>
//#define TRACE_ACPI //#define TRACE_ACPI
#ifdef TRACE_ACPI #ifdef TRACE_ACPI
@@ -44,7 +45,7 @@ acpi_check_rsdt(acpi_rsdp *rsdp)
acpi_descriptor_header *rsdt acpi_descriptor_header *rsdt
= (acpi_descriptor_header *)mmu_map_physical_memory( = (acpi_descriptor_header *)mmu_map_physical_memory(
rsdp->rsdt_address, B_PAGE_SIZE, kDefaultPageFlags); rsdp->rsdt_address, B_PAGE_SIZE, kDefaultPageFlags);
if (!rsdt || strncmp(rsdt->signature, ACPI_RSDT_SIGNATURE, 4) != 0) { if (rsdt == NULL || strncmp(rsdt->signature, ACPI_RSDT_SIGNATURE, 4) != 0) {
TRACE(("acpi: invalid root system description table\n")); TRACE(("acpi: invalid root system description table\n"));
return B_ERROR; return B_ERROR;
} }
@@ -57,11 +58,11 @@ acpi_check_rsdt(acpi_rsdp *rsdp)
acpi_descriptor_header * acpi_descriptor_header *
acpi_find_table(char *signature) acpi_find_table(char *signature)
{ {
if (sAcpiRsdt == NULL) { if (sAcpiRsdt == NULL)
return NULL; return NULL;
}
// Tried to keep numEntries a static variable; kept turning up 0 on table scan // Tried to keep numEntries a static variable; kept turning up 0 on table
// scan
// TODO: This calculates numEntries for every acpi probe. // TODO: This calculates numEntries for every acpi probe.
int32 numEntries = (sAcpiRsdt->length - sizeof(acpi_descriptor_header)) / 4; int32 numEntries = (sAcpiRsdt->length - sizeof(acpi_descriptor_header)) / 4;
if (numEntries <= 0) { if (numEntries <= 0) {
@@ -69,14 +70,19 @@ acpi_find_table(char *signature)
return NULL; return NULL;
} }
TRACE(("acpi: searching %ld entries for table '%.4s'\n", numEntries, signature)); TRACE(("acpi: searching %ld entries for table '%.4s'\n", numEntries,
uint32 *pointer = (uint32 *)((uint8 *)sAcpiRsdt + sizeof(acpi_descriptor_header)); signature));
uint32 *pointer = (uint32 *)((uint8 *)sAcpiRsdt
+ sizeof(acpi_descriptor_header));
for (int32 j = 0; j < numEntries; j++, pointer++) { for (int32 j = 0; j < numEntries; j++, pointer++) {
acpi_descriptor_header *header = (acpi_descriptor_header *) acpi_descriptor_header *header = (acpi_descriptor_header *)
mmu_map_physical_memory(*pointer, B_PAGE_SIZE, kDefaultPageFlags); mmu_map_physical_memory(*pointer, B_PAGE_SIZE, kDefaultPageFlags);
if (!header || strncmp(header->signature, signature, 4) != 0) { if (header == NULL || strncmp(header->signature, signature, 4) != 0) {
// not interesting for us // not interesting for us
TRACE(("acpi: Looking for '%.4s'. Skipping '%.4s'\n", signature, header->signature)); TRACE(("acpi: Looking for '%.4s'. Skipping '%.4s'\n", signature,
header->signature));
continue; continue;
} }
TRACE(("acpi: Found '%.4s' @ %p\n", signature, pointer)); TRACE(("acpi: Found '%.4s' @ %p\n", signature, pointer));
@@ -91,21 +97,22 @@ acpi_find_table(char *signature)
void void
acpi_init(void) acpi_init(void)
{ {
acpi_rsdp *rsdp = NULL;
// Try to find the ACPI RSDP. // Try to find the ACPI RSDP.
for (int32 i = 0; acpi_scan_spots[i].length > 0; i++) { for (int32 i = 0; acpi_scan_spots[i].length > 0; i++) {
char *pointer; acpi_rsdp *rsdp = NULL;
TRACE(("acpi_init: entry base 0x%lx, limit 0x%lx\n", acpi_scan_spots[i].start,
acpi_scan_spots[i].stop)); TRACE(("acpi_init: entry base 0x%lx, limit 0x%lx\n",
for (pointer = (char *)acpi_scan_spots[i].start; acpi_scan_spots[i].start, acpi_scan_spots[i].stop));
for (char *pointer = (char *)acpi_scan_spots[i].start;
(uint32)pointer < acpi_scan_spots[i].stop; pointer += 16) { (uint32)pointer < acpi_scan_spots[i].stop; pointer += 16) {
if (strncmp(pointer, ACPI_RSDP_SIGNATURE, 8) == 0) { if (strncmp(pointer, ACPI_RSDP_SIGNATURE, 8) == 0) {
TRACE(("acpi_init: found ACPI RSDP signature at %p\n", pointer)); TRACE(("acpi_init: found ACPI RSDP signature at %p\n", pointer));
rsdp = (acpi_rsdp *)pointer; rsdp = (acpi_rsdp *)pointer;
} }
} }
if (acpi_check_rsdt(rsdp) == B_OK)
if (rsdp != NULL && acpi_check_rsdt(rsdp) == B_OK)
break; break;
} }
} }