Commit 2b821188 authored by Kees Cook's avatar Kees Cook Committed by Rafael J. Wysocki
Browse files

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: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2039736.usQuhbGJ8B@rjwysocki.net
parent 6da5e6f3

drivers/acpi/acpica/aclocal.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/acpi/acpica/nsnames.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/acpi/acpica/nsrepair2.c

+1 −1
Original line number Diff line number Diff line
@@ -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;