Commit 3d867f6c authored by Kees Cook's avatar Kees Cook Committed by Rafael J. Wysocki

ACPICA: Use designated initializers

The struct layout randomization plugin detects and randomizes any structs
that contain only function pointers. Once layout is randomized, all
initialization must be designated or the compiler will misalign the
assignments. This switches all the ACPICA function pointer struct to
use designated initializers, using the proposed upstream ACPICA macro:
https://github.com/acpica/acpica/pull/248/Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a976c295
...@@ -70,11 +70,15 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id); ...@@ -70,11 +70,15 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
/* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */ /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
static struct acpi_sleep_functions acpi_sleep_dispatch[] = { static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
{ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep), {ACPI_STRUCT_INIT(legacy_function,
acpi_hw_extended_sleep}, ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep)),
{ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep), ACPI_STRUCT_INIT(extended_function, acpi_hw_extended_sleep) },
acpi_hw_extended_wake_prep}, {ACPI_STRUCT_INIT(legacy_function,
{ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake} ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep)),
ACPI_STRUCT_INIT(extended_function, acpi_hw_extended_wake_prep) },
{ACPI_STRUCT_INIT(legacy_function,
ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake)),
ACPI_STRUCT_INIT(extended_function, acpi_hw_extended_wake) }
}; };
/* /*
......
...@@ -382,4 +382,8 @@ ...@@ -382,4 +382,8 @@
#define ACPI_INIT_FUNCTION #define ACPI_INIT_FUNCTION
#endif #endif
#ifndef ACPI_STRUCT_INIT
#define ACPI_STRUCT_INIT(field, value) value
#endif
#endif /* __ACENV_H__ */ #endif /* __ACENV_H__ */
...@@ -178,6 +178,8 @@ ...@@ -178,6 +178,8 @@
#define ACPI_MSG_BIOS_ERROR KERN_ERR "ACPI BIOS Error (bug): " #define ACPI_MSG_BIOS_ERROR KERN_ERR "ACPI BIOS Error (bug): "
#define ACPI_MSG_BIOS_WARNING KERN_WARNING "ACPI BIOS Warning (bug): " #define ACPI_MSG_BIOS_WARNING KERN_WARNING "ACPI BIOS Warning (bug): "
#define ACPI_STRUCT_INIT(field, value) .field = value
#else /* !__KERNEL__ */ #else /* !__KERNEL__ */
#define ACPI_USE_STANDARD_HEADERS #define ACPI_USE_STANDARD_HEADERS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment