Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPICA: acpi_resource_irq: Replace 1-element arrays with flexible array

Browse Source 
ACPICA commit bfdd3446e7caf795c85c70326c137023942972c5

Similar to "Replace one-element array with flexible-array", replace the
1-element array with a proper flexible array member as defined by C99.

This allows the code to operate without tripping compile-time and run-
time bounds checkers (e.g. via __builtin_object_size(), -fsanitize=bounds,
and/or -fstrict-flex-arrays=3). Note that the spec requires there be at
least one interrupt, so use a union to keep space allocated for this.

The only binary change in .text and .data sections is some rearrangement
by the compiler of acpi_dm_address_common(), but appears to be harmless.

Link: https://github.com/acpica/acpica/commit/bfdd3446
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Kees Cook 2023-04-05 15:56:59 +02:00 committed by Rafael J. Wysocki
parent 2a85fc5626
commit 376b0fb3ad
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/acpica/amlresrc.h
View File

@ -261,7 +261,10 @@ struct aml_resource_address16 {
struct aml_resource_extended_irq { struct aml_resource_extended_irq {
AML_RESOURCE_LARGE_HEADER_COMMON u8 flags; AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
u8 interrupt_count; u8 interrupt_count;
u32 interrupts[1]; union {
u32 interrupt;
ACPI_FLEX_ARRAY(u32, interrupts);
};
/* res_source_index, res_source optional fields follow */ /* res_source_index, res_source optional fields follow */
}; };

10
include/acpi/acrestyp.h
View File

@ -142,7 +142,10 @@ struct acpi_resource_irq {
u8 shareable; u8 shareable;
u8 wake_capable; u8 wake_capable;
u8 interrupt_count; u8 interrupt_count;
u8 interrupts[1]; union {
u8 interrupt;
ACPI_FLEX_ARRAY(u8, interrupts);
};
}; };
struct acpi_resource_dma { struct acpi_resource_dma {
@ -335,7 +338,10 @@ struct acpi_resource_extended_irq {
u8 wake_capable; u8 wake_capable;
u8 interrupt_count; u8 interrupt_count;
struct acpi_resource_source resource_source; struct acpi_resource_source resource_source;
u32 interrupts[1]; union {
u32 interrupt;
ACPI_FLEX_ARRAY(u32, interrupts);
};
}; };
struct acpi_resource_generic_register { struct acpi_resource_generic_register {