Commit 70662db7 authored by Ahmed Salem's avatar Ahmed Salem Committed by Rafael J. Wysocki
Browse files

ACPICA: Apply ACPI_NONSTRING in more places 

ACPICA commit 1035a3d453f7dd49a235a59ee84ebda9d2d2f41b

Add ACPI_NONSTRING for destination char arrays without a terminating NUL
character. This is a follow-up to commit 35ad99236f3a ("ACPICA: Apply
ACPI_NONSTRING") where not all instances received the same treatment, in
preparation for replacing strncpy() calls with memcpy()

Link: https://github.com/acpica/acpica/commit/1035a3d4


Signed-off-by: default avatarAhmed Salem <x0rw3ll@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3833065.MHq7AAxBmi@rjwysocki.net
parent 64b9dfd0

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct acpi_db_argument_info { 
struct acpi_db_execute_walk {

	u32 count;

	u32 max_count;

	char name_seg[ACPI_NAMESEG_SIZE + 1];

	char name_seg[ACPI_NAMESEG_SIZE + 1] ACPI_NONSTRING;

};



#define PARAM_LIST(pl)                  pl

include/acpi/actbl.h

+3 −3
Original line number Diff line number Diff line
@@ -66,12 +66,12 @@ 
 ******************************************************************************/



struct acpi_table_header {

	char signature[ACPI_NAMESEG_SIZE] __nonstring;	/* ASCII table signature */

	char signature[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;	/* ASCII table signature */

	u32 length;		/* Length of table in bytes, including this header */

	u8 revision;		/* ACPI Specification minor version number */

	u8 checksum;		/* To make sum of entire table == 0 */

	char oem_id[ACPI_OEM_ID_SIZE];	/* ASCII OEM identification */

	char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];	/* ASCII OEM table identification */

	char oem_id[ACPI_OEM_ID_SIZE] ACPI_NONSTRING;	/* ASCII OEM identification */

	char oem_table_id[ACPI_OEM_TABLE_ID_SIZE] ACPI_NONSTRING;	/* ASCII OEM table identification */

	u32 oem_revision;	/* OEM revision number */

	char asl_compiler_id[ACPI_NAMESEG_SIZE];	/* ASCII ASL compiler vendor ID */

	u32 asl_compiler_revision;	/* ASL compiler version */

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ ACPI_MODULE_NAME("oslinuxtbl") 
typedef struct osl_table_info {

	struct osl_table_info *next;

	u32 instance;

	char signature[ACPI_NAMESEG_SIZE];

	char signature[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;



} osl_table_info;

tools/power/acpi/tools/acpidump/apfiles.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int ap_open_output_file(char *pathname) 


int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)

{

	char filename[ACPI_NAMESEG_SIZE + 16];

	char filename[ACPI_NAMESEG_SIZE + 16] ACPI_NONSTRING;

	char instance_str[16];

	ACPI_FILE file;

	acpi_size actual;