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

Commit 29a241cc authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Add argument typechecking for all predefined ACPI names 



Fully implements typechecking on all incoming arguments for all
predefined names. This ensures that ACPI-related drivers are
passing the correct number of arguments, each of the correct
object type.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Acked-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e1405ca5

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o 
acpi-y +=		\

	nsaccess.o	\

	nsalloc.o	\

	nsarguments.o	\

	nsconvert.o	\

	nsdump.o	\

	nseval.o	\

drivers/acpi/acpica/aclocal.h

+0 −17
Original line number Diff line number Diff line
@@ -362,23 +362,6 @@ union acpi_predefined_info { 


#pragma pack()



/* Data block used during object validation */



struct acpi_predefined_data {

	char *pathname;

	const union acpi_predefined_info *predefined;

	union acpi_operand_object *parent_package;

	struct acpi_namespace_node *node;

	u32 flags;

	u32 return_btype;

	u8 node_flags;

};



/* Defines for Flags field above */



#define ACPI_OBJECT_REPAIRED    1

#define ACPI_OBJECT_WRAPPED     2



/* Return object auto-repair info */



typedef acpi_status(*acpi_object_converter) (union acpi_operand_object

drivers/acpi/acpica/acnamesp.h

+27 −16
Original line number Diff line number Diff line
@@ -223,22 +223,33 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info); 
void acpi_ns_exec_module_code_list(void);



/*

 * nspredef - Support for predefined/reserved names

 * nsarguments - Argument count/type checking for predefined/reserved names

 */

acpi_status

acpi_ns_check_predefined_names(struct acpi_namespace_node *node,

void

acpi_ns_check_argument_count(char *pathname,

			     struct acpi_namespace_node *node,

			     u32 user_param_count,

			       acpi_status return_status,

			       union acpi_operand_object **return_object);

			     const union acpi_predefined_info *info);



void

acpi_ns_check_parameter_count(char *pathname,

acpi_ns_check_acpi_compliance(char *pathname,

			      struct acpi_namespace_node *node,

			      const union acpi_predefined_info *predefined);



void acpi_ns_check_argument_types(struct acpi_evaluate_info *info);



/*

 * nspredef - Return value checking for predefined/reserved names

 */

acpi_status

acpi_ns_check_return_value(struct acpi_namespace_node *node,

			   struct acpi_evaluate_info *info,

			   u32 user_param_count,

			      const union acpi_predefined_info *info);

			   acpi_status return_status,

			   union acpi_operand_object **return_object);



acpi_status

acpi_ns_check_object_type(struct acpi_predefined_data *data,

acpi_ns_check_object_type(struct acpi_evaluate_info *info,

			  union acpi_operand_object **return_object_ptr,

			  u32 expected_btypes, u32 package_index);
@@ -246,7 +257,7 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data, 
 * nsprepkg - Validation of predefined name packages

 */

acpi_status

acpi_ns_check_package(struct acpi_predefined_data *data,

acpi_ns_check_package(struct acpi_evaluate_info *info,

		      union acpi_operand_object **return_object_ptr);



/*
@@ -308,24 +319,24 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node, 
 * predefined methods/objects

 */

acpi_status

acpi_ns_simple_repair(struct acpi_predefined_data *data,

acpi_ns_simple_repair(struct acpi_evaluate_info *info,

		      u32 expected_btypes,

		      u32 package_index,

		      union acpi_operand_object **return_object_ptr);



acpi_status

acpi_ns_wrap_with_package(struct acpi_predefined_data *data,

acpi_ns_wrap_with_package(struct acpi_evaluate_info *info,

			  union acpi_operand_object *original_object,

			  union acpi_operand_object **obj_desc_ptr);



acpi_status

acpi_ns_repair_null_element(struct acpi_predefined_data *data,

acpi_ns_repair_null_element(struct acpi_evaluate_info *info,

			    u32 expected_btypes,

			    u32 package_index,

			    union acpi_operand_object **return_object_ptr);



void

acpi_ns_remove_null_elements(struct acpi_predefined_data *data,

acpi_ns_remove_null_elements(struct acpi_evaluate_info *info,

			     u8 package_type,

			     union acpi_operand_object *obj_desc);
@@ -334,7 +345,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data, 
 * predefined methods/objects

 */

acpi_status

acpi_ns_complex_repairs(struct acpi_predefined_data *data,

acpi_ns_complex_repairs(struct acpi_evaluate_info *info,

			struct acpi_namespace_node *node,

			acpi_status validate_status,

			union acpi_operand_object **return_object_ptr);

drivers/acpi/acpica/acpredef.h

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ enum acpi_return_package_types { 
#define ARG_COUNT_IS_MINIMUM            0x8000

#define METHOD_MAX_ARG_TYPE             ACPI_TYPE_PACKAGE



#define METHOD_GET_COUNT(arg_list)      (arg_list & METHOD_ARG_MASK)

#define METHOD_GET_NEXT_ARG(arg_list)   (arg_list >> METHOD_ARG_BIT_WIDTH)

#define METHOD_GET_ARG_COUNT(arg_list)  ((arg_list) & METHOD_ARG_MASK)

#define METHOD_GET_NEXT_TYPE(arg_list)  (((arg_list) >>= METHOD_ARG_BIT_WIDTH) & METHOD_ARG_MASK)



/* Macros used to build the predefined info table */

drivers/acpi/acpica/acstruct.h

+28 −12
Original line number Diff line number Diff line
@@ -178,26 +178,42 @@ union acpi_aml_operands { 
};



/*

 * Structure used to pass object evaluation parameters.

 * Structure used to pass object evaluation information and parameters.

 * Purpose is to reduce CPU stack use.

 */

struct acpi_evaluate_info {

	struct acpi_namespace_node *prefix_node;

	char *pathname;

	union acpi_operand_object *obj_desc;

	union acpi_operand_object **parameters;

	struct acpi_namespace_node *resolved_node;

	union acpi_operand_object *return_object;

	u8 param_count;

	u8 pass_number;

	u8 return_object_type;

	u8 flags;

	/* The first 3 elements are passed by the caller to acpi_ns_evaluate */



	struct acpi_namespace_node *prefix_node;	/* Input: starting node */

	char *relative_pathname;	/* Input: path relative to prefix_node */

	union acpi_operand_object **parameters;	/* Input: argument list */



	struct acpi_namespace_node *node;	/* Resolved node (prefix_node:relative_pathname) */

	union acpi_operand_object *obj_desc;	/* Object attached to the resolved node */

	char *full_pathname;	/* Full pathname of the resolved node */



	const union acpi_predefined_info *predefined;	/* Used if Node is a predefined name */

	union acpi_operand_object *return_object;	/* Object returned from the evaluation */

	union acpi_operand_object *parent_package;	/* Used if return object is a Package */



	u32 return_flags;	/* Used for return value analysis */

	u32 return_btype;	/* Bitmapped type of the returned object */

	u16 param_count;	/* Count of the input argument list */

	u8 pass_number;		/* Parser pass number */

	u8 return_object_type;	/* Object type of the returned object */

	u8 node_flags;		/* Same as Node->Flags */

	u8 flags;		/* General flags */

};



/* Values for Flags above */



#define ACPI_IGNORE_RETURN_VALUE    1



/* Defines for return_flags field above */



#define ACPI_OBJECT_REPAIRED        1

#define ACPI_OBJECT_WRAPPED         2



/* Info used by acpi_ns_initialize_devices */



struct acpi_device_walk_info {