diff options
author | Len Brown <len.brown@intel.com> | 2009-08-02 11:31:32 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-08-02 11:31:32 -0400 |
commit | b8a848ed7ffda36ed069f63de085a9411d2aa39f (patch) | |
tree | 42af80200ade14b6a27695d197a234e7e64b94e2 /drivers/acpi/acpica/dsopcode.c | |
parent | ed680c4ad478d0fee9740f7d029087f181346564 (diff) | |
parent | 7cb7f45c7feef43c8f71f5cfedfc0b19be2142f7 (diff) |
Merge branch 'bugzilla-13620-revert' into release
Diffstat (limited to 'drivers/acpi/acpica/dsopcode.c')
-rw-r--r-- | drivers/acpi/acpica/dsopcode.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c index 584d766e6f1..b79978f7bc7 100644 --- a/drivers/acpi/acpica/dsopcode.c +++ b/drivers/acpi/acpica/dsopcode.c @@ -397,6 +397,30 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc) status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node), 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); } |