[PATCH 21/32] ACPICA: actbl1: Replace 1-element arrays with flexible arrays

Rafael J. Wysocki
2023-04-05T14:01:55Z

From: Kees Cook <kees@outflux.net>

ACPICA commit 8c9bd5d151f77767b2fd937911848b7159dc8ee9

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).

No .text nor .data differences result from this change.

Link: https://github.com/acpica/acpica/commit/8c9bd5d1
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
include/acpi/actbl1.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 7a3ad28b86c6..6ee7437537db 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -944,7 +944,7 @@ struct acpi_table_drtm {

struct acpi_drtm_vtable_list {
u32 validated_table_count;
- u64 validated_tables[1];
+ u64 validated_tables[];
};

/* 2) Resources List (of Resource Descriptors) */
@@ -959,7 +959,7 @@ struct acpi_drtm_resource {

struct acpi_drtm_resource_list {
u32 resource_count;
- struct acpi_drtm_resource resources[1];
+ struct acpi_drtm_resource resources[];
};

/* 3) Platform-specific Identifiers List */
@@ -982,7 +982,7 @@ struct acpi_table_ecdt {
struct acpi_generic_address data; /* Address of EC data register */
u32 uid; /* Unique ID - must be same as the EC _UID method */
u8 gpe; /* The GPE for the EC */
- u8 id[1]; /* Full namepath of the EC in the ACPI namespace */
+ u8 id[]; /* Full namepath of the EC in the ACPI namespace */
};

/*******************************************************************************
--
2.35.3