summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorKees Cook <kees@outflux.net>2023-04-05 15:53:20 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-04-06 20:29:12 +0200
commit6671709c6ee5a9970ad94fe80823dc2fab711f84 (patch)
treea34f3c66db8be0fb274a1a3ddb130d8436e6cb68 /include/acpi
parent11132ad0176e9a6a847a9bfca77c39c2857cf85b (diff)
ACPICA: struct acpi_resource_dma: Replace 1-element array with flexible array
ACPICA commit 8409bb869a1790f6e02391c3f0eaf9c5fa63e33f Similar to "Replace one-element array with flexible-array", replace the 1-element array with a proper flexible array member as defined by C99, but without changing the structure size. 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). As with IRQs, leave a single element in a union. No binary changes appear in the .text nor .data sections. Link: https://github.com/acpica/acpica/commit/8409bb86 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acrestyp.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index 77d735594ac2..bfba293787ba 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -150,7 +150,10 @@ struct acpi_resource_dma {
u8 bus_master;
u8 transfer;
u8 channel_count;
- u8 channels[1];
+ union {
+ u8 channel;
+ ACPI_FLEX_ARRAY(u8, channels);
+ };
};
struct acpi_resource_start_dependent {