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

Commit f3454ae8 authored by Bob Moore's avatar Bob Moore Committed by Andi Kleen
Browse files

ACPICA: Add argument count checking to control method invocation via acpi_evaluate_object 



Error if too few arguments, warning if too many. This applies
only to external programmatic control method execution, not
method-to-method calls within the AML.

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 avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent c735ab7d

drivers/acpi/namespace/nseval.c

+35 −0
Original line number Diff line number Diff line
@@ -138,6 +138,41 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info) 
			return_ACPI_STATUS(AE_NULL_OBJECT);

		}



		/*

		 * Calculate the number of arguments being passed to the method

		 */



		info->param_count = 0;

		if (info->parameters) {

			while (info->parameters[info->param_count])

				info->param_count++;

		}



		/* Error if too few arguments were passed in */



		if (info->param_count < info->obj_desc->method.param_count) {

			ACPI_ERROR((AE_INFO,

				    "Insufficient arguments - "

				    "method [%4.4s] needs %d, found %d",

				    acpi_ut_get_node_name(info->resolved_node),

				    info->obj_desc->method.param_count,

				    info->param_count));

			return_ACPI_STATUS(AE_MISSING_ARGUMENTS);

		}



		/* Just a warning if too many arguments */



		else if (info->param_count >

				info->obj_desc->method.param_count) {

			ACPI_WARNING((AE_INFO,

				      "Excess arguments - "

				      "method [%4.4s] needs %d, found %d",

				      acpi_ut_get_node_name(info->

							    resolved_node),

				      info->obj_desc->method.param_count,

				      info->param_count));

		}



		ACPI_DUMP_PATHNAME(info->resolved_node, "Execute Method:",

				   ACPI_LV_INFO, _COMPONENT);

include/acpi/acexcep.h

+4 −2
Original line number Diff line number Diff line
@@ -108,8 +108,9 @@ 
#define AE_BAD_HEX_CONSTANT             (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)

#define AE_BAD_OCTAL_CONSTANT           (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)

#define AE_BAD_DECIMAL_CONSTANT         (acpi_status) (0x0009 | AE_CODE_PROGRAMMER)

#define AE_MISSING_ARGUMENTS		(acpi_status) (0x000A | AE_CODE_PROGRAMMER)



#define AE_CODE_PGM_MAX                 0x0009

#define AE_CODE_PGM_MAX 		0x000A



/*

 * Acpi table exceptions
@@ -233,7 +234,8 @@ char const *acpi_gbl_exception_names_pgm[] = { 
	"AE_ALIGNMENT",

	"AE_BAD_HEX_CONSTANT",

	"AE_BAD_OCTAL_CONSTANT",

	"AE_BAD_DECIMAL_CONSTANT"

	"AE_BAD_DECIMAL_CONSTANT",

	"AE_MISSING_ARGUMENTS"

};



char const *acpi_gbl_exception_names_tbl[] = {

include/acpi/acstruct.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct acpi_evaluate_info { 
	union acpi_operand_object **parameters;

	struct acpi_namespace_node *resolved_node;

	union acpi_operand_object *return_object;

	u8 param_count;

	u8 pass_number;

	u8 parameter_type;

	u8 return_object_type;