Skip to content

Commit 12fd607

Browse files
X0RW3LLrafaeljw
authored andcommitted
ACPICA: Apply ACPI_NONSTRING
Add ACPI_NONSTRING for destination char arrays without a terminating NUL character. This is a follow-up to commit 2b82118 ("ACPICA: Apply ACPI_NONSTRING") where a few more destination arrays were missed. Link: acpica/acpica@f359e5ed Fixes: 2b82118 ("ACPICA: Apply ACPI_NONSTRING") Signed-off-by: Ahmed Salem <x0rw3ll@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent feb8ae8 commit 12fd607

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

include/acpi/actbl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ struct acpi_table_header {
7373
char oem_id[ACPI_OEM_ID_SIZE] ACPI_NONSTRING; /* ASCII OEM identification */
7474
char oem_table_id[ACPI_OEM_TABLE_ID_SIZE] ACPI_NONSTRING; /* ASCII OEM table identification */
7575
u32 oem_revision; /* OEM revision number */
76-
char asl_compiler_id[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler vendor ID */
76+
char asl_compiler_id[ACPI_NAMESEG_SIZE] ACPI_NONSTRING; /* ASCII ASL compiler vendor ID */
7777
u32 asl_compiler_revision; /* ASL compiler version */
7878
};
7979

tools/power/acpi/os_specific/service_layers/oslinuxtbl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ static acpi_status osl_list_customized_tables(char *directory)
995995
{
996996
void *table_dir;
997997
u32 instance;
998-
char temp_name[ACPI_NAMESEG_SIZE];
998+
char temp_name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
999999
char *filename;
10001000
acpi_status status = AE_OK;
10011001

@@ -1312,7 +1312,7 @@ osl_get_customized_table(char *pathname,
13121312
{
13131313
void *table_dir;
13141314
u32 current_instance = 0;
1315-
char temp_name[ACPI_NAMESEG_SIZE];
1315+
char temp_name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
13161316
char table_filename[PATH_MAX];
13171317
char *filename;
13181318
acpi_status status;

0 commit comments

Comments
 (0)