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

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

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: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c351f2dd

drivers/acpi/executer/exoparg1.c

+17 −5
Original line number Diff line number Diff line
@@ -740,26 +740,38 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) 
			value = acpi_gbl_integer_byte_width;

			break;



		case ACPI_TYPE_BUFFER:

			value = temp_desc->buffer.length;

			break;



		case ACPI_TYPE_STRING:

			value = temp_desc->string.length;

			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:



			/* Package arguments may not be evaluated at this point */



			status = acpi_ds_get_package_arguments(temp_desc);

			value = temp_desc->package.count;

			break;



		default:

			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)));

			status = AE_AML_OPERAND_TYPE;

			goto cleanup;

		}



		if (ACPI_FAILURE(status)) {

			goto cleanup;

		}



		/*

		 * Now that we have the size of the object, create a result

		 * object to hold the value