Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACPICA: Enhance error reporting for invalid opcodes and bad ACPI_NAMEs

Browse Source 
For disassembler, dump the 48 bytes surrounding the invalid
opcode.  Fix incorrect table offset reported for invalid opcodes.
Report original 32-bit value for bad ACPI_NAMEs.

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>
This commit is contained in:
Bob Moore 2012-10-31 02:27:48 +00:00 committed by Rafael J. Wysocki
parent ff60027174
commit 00eb32550f
4 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/acpi/acpica/nsutils.c
View File

@ -557,10 +557,11 @@ acpi_ns_externalize_name(u32 internal_name_length,
(*converted_name)[j++] = '.'; (*converted_name)[j++] = '.';
} }
(*converted_name)[j++] = internal_name[names_index++]; ACPI_MOVE_NAME(*converted_name, internal_name);
(*converted_name)[j++] = internal_name[names_index++]; acpi_ut_repair_name(*converted_name);
(*converted_name)[j++] = internal_name[names_index++];
(*converted_name)[j++] = internal_name[names_index++]; j += ACPI_NAME_SIZE;
names_index += ACPI_NAME_SIZE;
} }
} }

51
drivers/acpi/acpica/psloop.c
View File

@ -135,16 +135,38 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
/* The opcode is unrecognized. Just skip unknown opcodes */ /* The opcode is unrecognized. Just skip unknown opcodes */
ACPI_ERROR((AE_INFO, if (walk_state->pass_number == 2) {
"Found unknown opcode 0x%X at AML address %p offset 0x%X, ignoring", ACPI_ERROR((AE_INFO,
walk_state->opcode, walk_state->parser_state.aml, "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring",
walk_state->aml_offset)); walk_state->opcode,
walk_state->aml_offset +
sizeof(struct acpi_table_header)));
ACPI_DUMP_BUFFER(walk_state->parser_state.aml, 128); ACPI_DUMP_BUFFER(walk_state->parser_state.aml, 128);
/* Assume one-byte bad opcode */ #ifdef ACPI_ASL_COMPILER
acpi_os_printf
("/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n",
walk_state->opcode,
walk_state->aml_offset +
sizeof(struct acpi_table_header));
/* TBD: Pass current offset to dump_buffer */
acpi_ut_dump_buffer2(((u8 *)walk_state->parser_state.
aml - 16), 48, DB_BYTE_DISPLAY);
acpi_os_printf(" */\n");
#endif
}
/* Increment past one or two-byte opcode */
walk_state->parser_state.aml++; walk_state->parser_state.aml++;
if (walk_state->opcode > 0xFF) {
walk_state->parser_state.aml++;
}
return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE); return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
default: default:
@ -519,11 +541,18 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
if ((op_info->class == if ((op_info->class ==
AML_CLASS_EXECUTE) && (!arg)) { AML_CLASS_EXECUTE) && (!arg)) {
ACPI_WARNING((AE_INFO, ACPI_WARNING((AE_INFO,
"Detected an unsupported executable opcode " "Unsupported module-level executable opcode "
"at module-level: [0x%.4X] at table offset 0x%.4X", "0x%.2X at table offset 0x%.4X",
op->common.aml_opcode, op->common.
(u32)((aml_op_start - walk_state->parser_state.aml_start) aml_opcode,
+ sizeof(struct acpi_table_header)))); (u32)
(ACPI_PTR_DIFF
(aml_op_start,
walk_state->
parser_state.
aml_start) +
sizeof(struct
acpi_table_header))));
} }
} }
break; break;

3
drivers/acpi/acpica/utmisc.c
View File

@ -720,9 +720,12 @@ void acpi_ut_repair_name(char *name)
{ {
u32 i; u32 i;
u8 found_bad_char = FALSE; u8 found_bad_char = FALSE;
u32 original_name;
ACPI_FUNCTION_NAME(ut_repair_name); ACPI_FUNCTION_NAME(ut_repair_name);
ACPI_MOVE_NAME(&original_name, name);
/* Check each character in the name */ /* Check each character in the name */
for (i = 0; i < ACPI_NAME_SIZE; i++) { for (i = 0; i < ACPI_NAME_SIZE; i++) {

2
drivers/acpi/acpica/utxferror.c
View File

@ -408,7 +408,7 @@ acpi_ut_namespace_error(const char *module_name,
ACPI_MOVE_32_TO_32(&bad_name, ACPI_MOVE_32_TO_32(&bad_name,
ACPI_CAST_PTR(u32, internal_name)); ACPI_CAST_PTR(u32, internal_name));
acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name); acpi_os_printf("[0x%.8X] (NON-ASCII)", bad_name);
} else { } else {
/* Convert path to external format */ /* Convert path to external format */