Commit 395ec731 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: iasl/acpiexec: Update input file handling and verification 

ACPICA commit 3a6f2a516dd35a4daacbc5b5144d1db763ff2cb0

Improve and cleanup verification of ACPI tables within input files.
Share more code between the disassembler and acpiexec.

This patch only affects application debugger commands, thus it is a
no-op chage for Linux kernel.

Link: https://github.com/acpica/acpica/commit/3a6f2a51


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 2ba7379b

drivers/acpi/acpica/acapps.h

+7 −3
Original line number Diff line number Diff line
@@ -95,10 +95,14 @@ 
/* acfileio */



acpi_status

acpi_ac_get_all_tables_from_file(char *filename,

ac_get_all_tables_from_file(char *filename,

			    u8 get_only_aml_tables,

			    struct acpi_new_table_desc **return_list_head);



u8 ac_is_file_binary(FILE * file);



acpi_status ac_validate_table_header(FILE * file, long table_offset);



/* Values for get_only_aml_tables */



#define ACPI_GET_ONLY_AML_TABLES    TRUE

drivers/acpi/acpica/dbinput.c

+3 −4
Original line number Diff line number Diff line
@@ -1056,8 +1056,7 @@ acpi_db_command_dispatch(char *input_buffer, 
			struct acpi_new_table_desc *list_head = NULL;



			status =

			    acpi_ac_get_all_tables_from_file(acpi_gbl_db_args

							     [1],

			    ac_get_all_tables_from_file(acpi_gbl_db_args[1],

							ACPI_GET_ALL_TABLES,

							&list_head);

			if (ACPI_SUCCESS(status)) {

drivers/acpi/acpica/exmisc.c

+2 −2
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc, 


		default:



			ACPI_ERROR((AE_INFO, "Unknown Reference Class 0x%2.2X",

			ACPI_ERROR((AE_INFO, "Invalid Reference Class 0x%2.2X",

				    obj_desc->reference.class));

			return_ACPI_STATUS(AE_AML_INTERNAL);

			return_ACPI_STATUS(AE_AML_OPERAND_TYPE);

		}

		break;

drivers/acpi/acpica/tbutils.c

+1 −7
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ next_table: 
 *

 * PARAMETERS:  signature           - Sig string to be validated

 *

 * RETURN:      TRUE if signature is correct length and has valid characters

 * RETURN:      TRUE if signature is has 4 valid ACPI characters

 *

 * DESCRIPTION: Validate an ACPI table signature.

 *
@@ -399,12 +399,6 @@ u8 acpi_is_valid_signature(char *signature) 
{

	u32 i;



	/* Validate the signature length */



	if (strlen(signature) != ACPI_NAME_SIZE) {

		return (FALSE);

	}



	/* Validate each character in the signature */



	for (i = 0; i < ACPI_NAME_SIZE; i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE