Skip to content

Commit

Permalink
ACPICA: Utilities: Validate full RSDP header
Browse files Browse the repository at this point in the history
Implement proper RSDP validation in acpi_ut_read_table(). Prevents a segmentation
fault that can occur if a user passes the wrong file to iasl.

This patch is only useful for iasl, which is not shipped in the Linux
kernel.

After the new table reading utility functions are well tested, acpidump can
also switch to use the generic acpi_ut_read_table_xxx() APIs. Currently
this patch is no-op as acpidump does not link to the new APIs.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
David E. Box authored and Rafael J. Wysocki committed Jul 8, 2014
1 parent e740304 commit ce5eb07
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions drivers/acpi/acpica/utfileio.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ acpi_ut_read_table(FILE * fp,
acpi_status status;
u32 file_size;
u8 standard_header = TRUE;
s32 count;

/* Get the file size */

Expand All @@ -164,27 +165,21 @@ acpi_ut_read_table(FILE * fp,

/* Read the signature */

if (fread(&table_header, 1, 4, fp) != 4) {
acpi_os_printf("Could not read the table signature\n");
fseek(fp, 0, SEEK_SET);

count = fread(&table_header, 1, sizeof(struct acpi_table_header), fp);
if (count != sizeof(struct acpi_table_header)) {
acpi_os_printf("Could not read the table header\n");
return (AE_BAD_HEADER);
}

fseek(fp, 0, SEEK_SET);

/* The RSDP table does not have standard ACPI header */

if (ACPI_COMPARE_NAME(table_header.signature, "RSD ")) {
if (ACPI_VALIDATE_RSDP_SIG(table_header.signature)) {
*table_length = file_size;
standard_header = FALSE;
} else {
/* Read the table header */

if (fread
(&table_header, 1, sizeof(struct acpi_table_header),
fp) != sizeof(struct acpi_table_header)) {
acpi_os_printf("Could not read the table header\n");
return (AE_BAD_HEADER);
}
#if 0
/* Validate the table header/length */

Expand Down

0 comments on commit ce5eb07

Please sign in to comment.