ACPICA: Apply ACPI_NONSTRING

ACPICA commit ed68cb8e082e3bfbba02814af4fd5a61247f491b

Add ACPI_NONSTRING annotations for places found that are using char
arrays without a terminating NUL character. These were found during
Linux kernel builds and after looking for instances of arrays of size
ACPI_NAMESEG_SIZE.

Link: https://github.com/acpica/acpica/commit/ed68cb8e
Signed-off-by: Kees Cook <kees@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2039736.usQuhbGJ8B@rjwysocki.net

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 6481c48c22bb7e476722349eaeeb156a475d4caf..b40e9a520618e0c8e2b77854f7c4edbd0ff78c57 100644 (file)
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -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] __nonstring;
+       char name[ACPI_NAMESEG_SIZE] ACPI_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] __nonstring;
+       char name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
        u32 unexpected_btypes;
        u32 package_index;
        acpi_object_converter object_converter;

diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index d91153f6570053b8d372c892f996c335e7d1607c..22aeeeb56cffdb7978268e7f908576da28778eb7 100644 (file)
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -194,7 +194,7 @@ acpi_ns_build_normalized_path(struct acpi_namespace_node *node,
                              char *full_path, u32 path_size, u8 no_trailing)
 {
        u32 length = 0, i;
-       char name[ACPI_NAMESEG_SIZE];
+       char name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
        u8 do_no_trailing;
        char c, *left, *right;
        struct acpi_namespace_node *next_node;

diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 330b5e4711daca6b660c9bd83f7f84186161080f..0075fc80d498432ca8bff4903db41efe6aa80dc8 100644 (file)
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -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] __nonstring;
+       char name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
        acpi_repair_function repair_function;
 
 } acpi_repair_info;