From: Kees Cook <kees@kernel.org>
Date: Wed, 5 Feb 2025 21:54:26 +0000 (-0800)
Subject: x86/tdx: Mark message.bytes as nonstring
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0e1d4656ea5fbecee9942fb2fc83ab579433421;p=users%2Fjedix%2Flinux-maple.git

x86/tdx: Mark message.bytes as nonstring

In preparation for strtomem*() checking that its destination is a
nonstring, rename and annotate message.bytes accordingly.

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Kees Cook <kees@kernel.org>
---

diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
index 32809a06dab4..7772b01ab738 100644
--- a/arch/x86/coco/tdx/tdx.c
+++ b/arch/x86/coco/tdx/tdx.c
@@ -167,11 +167,11 @@ static void __noreturn tdx_panic(const char *msg)
 		/* Define register order according to the GHCI */
 		struct { u64 r14, r15, rbx, rdi, rsi, r8, r9, rdx; };
 
-		char str[64];
+		char bytes[64] __nonstring;
 	} message;
 
 	/* VMM assumes '\0' in byte 65, if the message took all 64 bytes */
-	strtomem_pad(message.str, msg, '\0');
+	strtomem_pad(message.bytes, msg, '\0');
 
 	args.r8  = message.r8;
 	args.r9  = message.r9;