linux-kernel - [PATCH 4/6] x86/virt/tdx: Sanity check the size of each metadata field

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20251202050844.2520762-5-yilun.xu@linux.intel.com>
Date: Tue,  2 Dec 2025 13:08:42 +0800
From: Xu Yilun <yilun.xu@...ux.intel.com>
To: x86@...nel.org,
	dave.hansen@...ux.intel.com,
	kas@...nel.org,
	linux-kernel@...r.kernel.org
Cc: chao.gao@...el.com,
	rick.p.edgecombe@...el.com,
	dan.j.williams@...el.com,
	baolu.lu@...ux.intel.com,
	yilun.xu@...ux.intel.com,
	yilun.xu@...el.com,
	zhenzhong.duan@...el.com,
	kvm@...r.kernel.org,
	adrian.hunter@...el.com
Subject: [PATCH 4/6] x86/virt/tdx: Sanity check the size of each metadata field

Add the build-time check to ensure the manually input field mappings
have consistent size definitions. I.e. for each mapping entry, the size
code in field_id should match the corresponding struct member type. This
type safe check prevents wrong interpretation of the readout value.

Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Kai Huang <kai.huang@...el.com>
Signed-off-by: Xu Yilun <yilun.xu@...ux.intel.com>
---
 arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 24 ++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c
index 3db87c4accd6..836d97166a7a 100644
--- a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c
+++ b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c
@@ -13,10 +13,32 @@ struct field_mapping {
 	int size;
 };
 
+/*
+ * Size of field abstracted from field ID.
+ *
+ * See Table "MD_FIELD_ID (Metadata Field Identifier / Sequence Header)
+ * Definition", TDX module 1.5 ABI spec.
+ *
+ *  - Bit 33:32: ELEMENT_SIZE_CODE -- size of a single element of metadata
+ *
+ *	0: 8 bits
+ *	1: 16 bits
+ *	2: 32 bits
+ *	3: 64 bits
+ */
+#define MD_FIELD_SIZE_CODE(_field_id)	\
+	(((_field_id) & GENMASK_ULL(33, 32)) >> 32)
+
+#define MD_FIELD_SIZE(_field_id) (1 << MD_FIELD_SIZE_CODE(_field_id))
+
+#define TD_SYSINFO_CHECK_SIZE(_field_id, _size)		\
+	__builtin_choose_expr(MD_FIELD_SIZE(_field_id) == (_size), _size, (void)0)
+
 #define TD_SYSINFO_MAP(_field_id, _member)				\
 	{ .field_id = _field_id,					\
 	  .offset = offsetof(struct tdx_sys_info, _member),		\
-	  .size = sizeof_field(struct tdx_sys_info, _member) }
+	  .size = TD_SYSINFO_CHECK_SIZE(_field_id,			\
+					sizeof_field(struct tdx_sys_info, _member)) }
 
 /* Map TD_SYSINFO fields into 'struct tdx_sys_info': */
 static const struct field_mapping mappings[] = {
-- 
2.25.1