diff options
| author | Len Brown <len.brown@intel.com> | 2012-01-17 09:33:49 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-17 09:33:49 +0100 |
| commit | 3298758385bbffa792f009fd965e02203aaf82a2 (patch) | |
| tree | 5f7a6cc4bc91a2ab52a2860b067f6727ce4bf68b /drivers/acpi | |
| parent | Linux 3.2 (diff) | |
| parent | ACPICA: Put back the call to acpi_os_validate_address (diff) | |
| download | linux-3298758385bbffa792f009fd965e02203aaf82a2.tar.xz linux-3298758385bbffa792f009fd965e02203aaf82a2.zip | |
Merge branch 'acpica-validate-address-regression' into next
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/dsargs.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c index 8c7b99728aa2..42163d8db50b 100644 --- a/drivers/acpi/acpica/dsargs.c +++ b/drivers/acpi/acpica/dsargs.c @@ -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); } |