Skip to content

Commit

Permalink
Merge branch 'acpica-validate-address-regression' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
lenb committed Jan 17, 2012
2 parents 805a6af + da4d8b2 commit 3298758
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions drivers/acpi/acpica/dsargs.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,5 +387,29 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
status = acpi_ds_execute_arguments(node, node->parent,
extra_desc->extra.aml_length,
extra_desc->extra.aml_start);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}

/* Validate the region address/length via the host OS */

status = acpi_os_validate_address(obj_desc->region.space_id,
obj_desc->region.address,
(acpi_size) obj_desc->region.length,
acpi_ut_get_node_name(node));

if (ACPI_FAILURE(status)) {
/*
* Invalid address/length. We will emit an error message and mark
* the region as invalid, so that it will cause an additional error if
* it is ever used. Then return AE_OK.
*/
ACPI_EXCEPTION((AE_INFO, status,
"During address validation of OpRegion [%4.4s]",
node->name.ascii));
obj_desc->common.flags |= AOPOBJ_INVALID;
status = AE_OK;
}

return_ACPI_STATUS(status);
}

0 comments on commit 3298758

Please sign in to comment.