mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 02:53:36 +02:00
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: Ahmed Salem <x0rw3ll@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3833065.MHq7AAxBmi@rjwysocki.net
This commit is contained in:
parent
64b9dfd077
commit
70662db73d
|
|
@ -37,7 +37,7 @@ struct acpi_db_argument_info {
|
||||||
struct acpi_db_execute_walk {
|
struct acpi_db_execute_walk {
|
||||||
u32 count;
|
u32 count;
|
||||||
u32 max_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
|
#define PARAM_LIST(pl) pl
|
||||||
|
|
|
||||||
|
|
@ -66,12 +66,12 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
struct acpi_table_header {
|
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 */
|
u32 length; /* Length of table in bytes, including this header */
|
||||||
u8 revision; /* ACPI Specification minor version number */
|
u8 revision; /* ACPI Specification minor version number */
|
||||||
u8 checksum; /* To make sum of entire table == 0 */
|
u8 checksum; /* To make sum of entire table == 0 */
|
||||||
char oem_id[ACPI_OEM_ID_SIZE]; /* ASCII OEM identification */
|
char oem_id[ACPI_OEM_ID_SIZE] ACPI_NONSTRING; /* ASCII OEM identification */
|
||||||
char oem_table_id[ACPI_OEM_TABLE_ID_SIZE]; /* ASCII OEM table identification */
|
char oem_table_id[ACPI_OEM_TABLE_ID_SIZE] ACPI_NONSTRING; /* ASCII OEM table identification */
|
||||||
u32 oem_revision; /* OEM revision number */
|
u32 oem_revision; /* OEM revision number */
|
||||||
char asl_compiler_id[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler vendor ID */
|
char asl_compiler_id[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler vendor ID */
|
||||||
u32 asl_compiler_revision; /* ASL compiler version */
|
u32 asl_compiler_revision; /* ASL compiler version */
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ ACPI_MODULE_NAME("oslinuxtbl")
|
||||||
typedef struct osl_table_info {
|
typedef struct osl_table_info {
|
||||||
struct osl_table_info *next;
|
struct osl_table_info *next;
|
||||||
u32 instance;
|
u32 instance;
|
||||||
char signature[ACPI_NAMESEG_SIZE];
|
char signature[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
|
||||||
|
|
||||||
} osl_table_info;
|
} osl_table_info;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ int ap_open_output_file(char *pathname)
|
||||||
|
|
||||||
int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
|
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];
|
char instance_str[16];
|
||||||
ACPI_FILE file;
|
ACPI_FILE file;
|
||||||
acpi_size actual;
|
acpi_size actual;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user