lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPICA: Add a table checksum verify for Load operator

Browse Source 
Added a table checksum verification for the Load operator, in
the case where the load is from a buffer.

http://www.acpica.org/bugzilla/show_bug.cgi?id=578

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bob Moore
2008-04-10 19:06:39 +04:00
committed by Len Brown
parent a13b8460c5
commit 98af37fba9
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/acpi/executer/exconfig.c
View File

@@ -275,6 +275,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
struct acpi_table_desc table_desc; struct acpi_table_desc table_desc;
acpi_native_uint table_index; acpi_native_uint table_index;
acpi_status status; acpi_status status;
u32 length;
ACPI_FUNCTION_TRACE(ex_load_op); ACPI_FUNCTION_TRACE(ex_load_op);
@@ -322,18 +323,35 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
"Load from Buffer or Field %p %s\n", obj_desc, "Load from Buffer or Field %p %s\n", obj_desc,
acpi_ut_get_object_type_name(obj_desc))); acpi_ut_get_object_type_name(obj_desc)));
length = obj_desc->buffer.length;
/* Must have at least an ACPI table header */
if (length < sizeof(struct acpi_table_header)) {
return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
}
/* Validate checksum here. It won't get validated in tb_add_table */
status = acpi_tb_verify_checksum((struct acpi_table_header *)
obj_desc->buffer.pointer,
length);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
/* /*
* We need to copy the buffer since the original buffer could be * We need to copy the buffer since the original buffer could be
* changed or deleted in the future * changed or deleted in the future
*/ */
table_desc.pointer = ACPI_ALLOCATE(obj_desc->buffer.length); table_desc.pointer = ACPI_ALLOCATE(length);
if (!table_desc.pointer) { if (!table_desc.pointer) {
return_ACPI_STATUS(AE_NO_MEMORY); return_ACPI_STATUS(AE_NO_MEMORY);
} }
ACPI_MEMCPY(table_desc.pointer, obj_desc->buffer.pointer, ACPI_MEMCPY(table_desc.pointer, obj_desc->buffer.pointer,
obj_desc->buffer.length); length);
table_desc.length = obj_desc->buffer.length; table_desc.length = length;
table_desc.flags = ACPI_TABLE_ORIGIN_ALLOCATED; table_desc.flags = ACPI_TABLE_ORIGIN_ALLOCATED;
break; break;

2
drivers/acpi/tables/tbutils.c
View File

@@ -212,7 +212,7 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
if (checksum) { if (checksum) {
ACPI_WARNING((AE_INFO, ACPI_WARNING((AE_INFO,
"Incorrect checksum in table [%4.4s] - %2.2X, should be %2.2X", "Incorrect checksum in table [%4.4s] - %2.2X, should be %2.2X",
table->signature, table->checksum, table->signature, table->checksum,
(u8) (table->checksum - checksum))); (u8) (table->checksum - checksum)));