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

Commit 528a412c authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent afb1bbee

drivers/acpi/acpica/exconfig.c

+4 −3
Original line number Diff line number Diff line
@@ -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)