aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-06-10 00:25:42 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 17:27:03 -0400
commitf3454ae8104efb2dbf0d08ec42c6f5d0fe9225bc (patch)
tree61c85b910e1d56eb5245f1a9d81aead8206b7f87 /include/acpi
parentc735ab7da3414c3e639d5c5223092b74689e5d87 (diff)
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: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acexcep.h6
-rw-r--r--include/acpi/acstruct.h1
2 files changed, 5 insertions, 2 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 1f591171bf31..ea627ed2420d 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -108,8 +108,9 @@
108#define AE_BAD_HEX_CONSTANT (acpi_status) (0x0007 | AE_CODE_PROGRAMMER) 108#define AE_BAD_HEX_CONSTANT (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)
109#define AE_BAD_OCTAL_CONSTANT (acpi_status) (0x0008 | AE_CODE_PROGRAMMER) 109#define AE_BAD_OCTAL_CONSTANT (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)
110#define AE_BAD_DECIMAL_CONSTANT (acpi_status) (0x0009 | AE_CODE_PROGRAMMER) 110#define AE_BAD_DECIMAL_CONSTANT (acpi_status) (0x0009 | AE_CODE_PROGRAMMER)
111#define AE_MISSING_ARGUMENTS (acpi_status) (0x000A | AE_CODE_PROGRAMMER)
111 112
112#define AE_CODE_PGM_MAX 0x0009 113#define AE_CODE_PGM_MAX 0x000A
113 114
114/* 115/*
115 * Acpi table exceptions 116 * Acpi table exceptions
@@ -233,7 +234,8 @@ char const *acpi_gbl_exception_names_pgm[] = {
233 "AE_ALIGNMENT", 234 "AE_ALIGNMENT",
234 "AE_BAD_HEX_CONSTANT", 235 "AE_BAD_HEX_CONSTANT",
235 "AE_BAD_OCTAL_CONSTANT", 236 "AE_BAD_OCTAL_CONSTANT",
236 "AE_BAD_DECIMAL_CONSTANT" 237 "AE_BAD_DECIMAL_CONSTANT",
238 "AE_MISSING_ARGUMENTS"
237}; 239};
238 240
239char const *acpi_gbl_exception_names_tbl[] = { 241char const *acpi_gbl_exception_names_tbl[] = {
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index a907c67d651e..1cc74504f1c4 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -189,6 +189,7 @@ struct acpi_evaluate_info {
189 union acpi_operand_object **parameters; 189 union acpi_operand_object **parameters;
190 struct acpi_namespace_node *resolved_node; 190 struct acpi_namespace_node *resolved_node;
191 union acpi_operand_object *return_object; 191 union acpi_operand_object *return_object;
192 u8 param_count;
192 u8 pass_number; 193 u8 pass_number;
193 u8 parameter_type; 194 u8 parameter_type;
194 u8 return_object_type; 195 u8 return_object_type;