diff options
| author | Bob Moore | 2012-12-31 01:05:09 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2013-01-10 12:36:19 +0100 |
| commit | 528a412c86e7a831d0fd157cac65749b45b64e06 (patch) | |
| tree | f667eada3a528c512311a5edeb8252c7f542d720 /drivers/acpi/acpica/exconfig.c | |
| parent | ACPICA: Resources: New interface, AcpiWalkResourceBuffer. (diff) | |
| download | kernel-qcow2-linux-528a412c86e7a831d0fd157cac65749b45b64e06.tar.gz kernel-qcow2-linux-528a412c86e7a831d0fd157cac65749b45b64e06.tar.xz kernel-qcow2-linux-528a412c86e7a831d0fd157cac65749b45b64e06.zip | |
ACPICA: Change exception code for LoadTable operator.
For the case where one of the input strings is too long,
change the returned exception code from AE_BAD_PARAMETER to
AE_AML_STRING_LIMIT.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exconfig.c')
| -rw-r--r-- | drivers/acpi/acpica/exconfig.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c index d0cc2a40edfb..f214dbfc4047 100644 --- a/drivers/acpi/acpica/exconfig.c +++ b/drivers/acpi/acpica/exconfig.c @@ -48,6 +48,7 @@ #include "actables.h" #include "acdispat.h" #include "acevents.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER ACPI_MODULE_NAME("exconfig") @@ -166,7 +167,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, if ((operand[0]->string.length > ACPI_NAME_SIZE) || (operand[1]->string.length > ACPI_OEM_ID_SIZE) || (operand[2]->string.length > ACPI_OEM_TABLE_ID_SIZE)) { - return_ACPI_STATUS(AE_BAD_PARAMETER); + return_ACPI_STATUS(AE_AML_STRING_LIMIT); } /* Find the ACPI table in the RSDT/XSDT */ @@ -213,8 +214,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, /* parameter_path (optional parameter) */ if (operand[4]->string.length > 0) { - if ((operand[4]->string.pointer[0] != '\\') && - (operand[4]->string.pointer[0] != '^')) { + if ((operand[4]->string.pointer[0] != AML_ROOT_PREFIX) && + (operand[4]->string.pointer[0] != AML_PARENT_PREFIX)) { /* * Path is not absolute, so it will be relative to the node * referenced by the root_path_string (or the NS root if omitted) |