summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorKees Cook <kees@outflux.net>2023-04-05 15:55:13 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-04-06 20:29:12 +0200
commit49bd783e4fe19c03d3ce97ab066e865acc6c7b15 (patch)
tree933cf1bb93be1ecb5ee06e1ea38ff4b583e5c54e /include/acpi
parent3a287932da6a97c84437669a6fec1486401893d2 (diff)
downloadlwn-49bd783e4fe19c03d3ce97ab066e865acc6c7b15.tar.gz
lwn-49bd783e4fe19c03d3ce97ab066e865acc6c7b15.zip
ACPICA: acpi_dmar_andd: Replace 1-element array with flexible array
ACPICA commit 3c19ae70424e9ab1e1b805203d300d2660f9a2f7 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). The handling of struct acpi_dmar_andd by acpi_dm_dump_dmar() appears to expect a single trailing char for calculating table offsets. Keep a char in the union to avoid any code changes appearing in the .text or .data sections. Link: https://github.com/acpica/acpica/commit/3c19ae70 Signed-off-by: Kees Cook <kees@outflux.net> 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/actbl1.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 6ee7437537db..58b0490a2ad1 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -901,7 +901,10 @@ struct acpi_dmar_andd {
struct acpi_dmar_header header;
u8 reserved[3];
u8 device_number;
- char device_name[1];
+ union {
+ char __pad;
+ ACPI_FLEX_ARRAY(char, device_name);
+ };
};
/* 5: SOC Integrated Address Translation Cache Reporting Structure */