ACPICA: Fix for SizeOf when used with Buffers and Packages
Fixed a problem with the SizeOf operator when used with Package and Buffer objects. These objects have deferred execution for some arguments, and the execution is now completed before the SizeOf is executed. This problem caused unexpected AE_PACKAGE_LIMIT errors on some systems. http://bugzilla.kernel.org/show_bug.cgi?id=9558 Signed-off-by: Lin Ming <ming.m.lin@intel.com> 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:
parent
c351f2dd54
commit
8246934b7c
1 changed files with 17 additions and 5 deletions
|
@ -740,26 +740,38 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
|
||||||
value = acpi_gbl_integer_byte_width;
|
value = acpi_gbl_integer_byte_width;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ACPI_TYPE_BUFFER:
|
|
||||||
value = temp_desc->buffer.length;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ACPI_TYPE_STRING:
|
case ACPI_TYPE_STRING:
|
||||||
value = temp_desc->string.length;
|
value = temp_desc->string.length;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ACPI_TYPE_BUFFER:
|
||||||
|
|
||||||
|
/* Buffer arguments may not be evaluated at this point */
|
||||||
|
|
||||||
|
status = acpi_ds_get_buffer_arguments(temp_desc);
|
||||||
|
value = temp_desc->buffer.length;
|
||||||
|
break;
|
||||||
|
|
||||||
case ACPI_TYPE_PACKAGE:
|
case ACPI_TYPE_PACKAGE:
|
||||||
|
|
||||||
|
/* Package arguments may not be evaluated at this point */
|
||||||
|
|
||||||
|
status = acpi_ds_get_package_arguments(temp_desc);
|
||||||
value = temp_desc->package.count;
|
value = temp_desc->package.count;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
ACPI_ERROR((AE_INFO,
|
ACPI_ERROR((AE_INFO,
|
||||||
"Operand is not Buf/Int/Str/Pkg - found type %s",
|
"Operand must be Buffer/Integer/String/Package - found type %s",
|
||||||
acpi_ut_get_type_name(type)));
|
acpi_ut_get_type_name(type)));
|
||||||
status = AE_AML_OPERAND_TYPE;
|
status = AE_AML_OPERAND_TYPE;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ACPI_FAILURE(status)) {
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now that we have the size of the object, create a result
|
* Now that we have the size of the object, create a result
|
||||||
* object to hold the value
|
* object to hold the value
|
||||||
|
|
Reference in a new issue