ACPICA: Add __nonstring annotations for unterminated strings

PATCH Superseded Kees Cook 1 participant 1 message Mar 12, 2025

Subsystems (2)

ACPI ACPI component architecture (acpica)

lore

Share & tools

lore

Kees Cook

author

2025-03-12 16:59 UTC #0 lore raw

PATCH 1/1 ACPICA: Add __nonstring annotations for unterminated strings

When a character array without a terminating NUL character has a static initializer, GCC 15's -Wunterminated-string-initialization will only warn if the array lacks the "nonstring" attribute[1]. Mark the arrays with __nonstring to and correctly identify the char array as "not a C string" and thereby eliminate the warning.

Link https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1]

Signed-off-by Kees Cook <[email protected]>

---
I wanted to send this as the fix from the "Linux perspective", but I know ACPICA is separate upstream, and likely the fixes will come from there. To that end, I've proposed these changes uptream as well:
https://github.com/acpica/acpica/pull/1006

Cc Robert Moore <[email protected]>

Cc "Rafael J. Wysocki" <[email protected]>

Cc Len Brown <[email protected]>

Cc [email protected]

---
 drivers/acpi/acpica/aclocal.h   | 4 ++--
 drivers/acpi/acpica/nsrepair2.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/acpi/acpica/aclocal.h +2 -2

index 6f4fe47c955b..6481c48c22bb 100644
@@ -293,7 +293,7 @@ acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state);
  * expected_return_btypes - Allowed type(s) for the return value
  */
 struct acpi_name_info {
-	char name[ACPI_NAMESEG_SIZE];
+	char name[ACPI_NAMESEG_SIZE] __nonstring;
 	u16 argument_list;
 	u8 expected_btypes;
 };

@@ -370,7 +370,7 @@ typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node *
 					      converted_object);
 
 struct acpi_simple_repair_info {
-	char name[ACPI_NAMESEG_SIZE];
+	char name[ACPI_NAMESEG_SIZE] __nonstring;
 	u32 unexpected_btypes;
 	u32 package_index;
 	acpi_object_converter object_converter;

drivers/acpi/acpica/nsrepair2.c +1 -1

index 1bb7b71f07f1..330b5e4711da 100644
@@ -25,7 +25,7 @@ acpi_status (*acpi_repair_function) (struct acpi_evaluate_info * info,
 				     return_object_ptr);
 
 typedef struct acpi_repair_info {
-	char name[ACPI_NAMESEG_SIZE];
+	char name[ACPI_NAMESEG_SIZE] __nonstring;
 	acpi_repair_function repair_function;
 
 } acpi_repair_info;

Signature · 1 line

2.34.1