Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4d8b28 authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPICA: Put back the call to acpi_os_validate_address 



The call to acpi_os_validate_address in acpi_ds_get_region_arguments was
removed by mistake in commit 9ad19ac4(ACPICA: Split large dsopcode and
dsload.c files).

Put it back.

Cc: stable@vger.kernel.org # 2.6.38+
Reported-and-bisected-by: default avatarLuca Tettamanti <kronos.it@gmail.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9ad19ac4

drivers/acpi/acpica/dsargs.c

+24 −0
Original line number Diff line number Diff line
@@ -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);

}