From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Apr 2026 21:42:55 +0000 (-0700)
Subject: Merge tag 'x86_tdx_for_7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=883af1f8e8788b99c5cd6797219bca44571775c9;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86_tdx_for_7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 TDX updates from Dave Hansen:
 "The only real thing of note here is printing the TDX module version.

  This is a little silly on its own, but the upcoming TDX module update
  code needs the same TDX module call. This shrinks that set a wee bit.

  There's also few minor macro cleanups and a tweak to the GetQuote ABI
  to make it easier for userspace to detect zero-length (failed) quotes"

* tag 'x86_tdx_for_7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  virt: tdx-guest: Return error for GetQuote failures
  KVM/TDX: Rename KVM_SUPPORTED_TD_ATTRS to KVM_SUPPORTED_TDX_TD_ATTRS
  x86/tdx: Rename TDX_ATTR_* to TDX_TD_ATTR_*
  KVM/TDX: Remove redundant definitions of TDX_TD_ATTR_*
  x86/tdx: Fix the typo in TDX_ATTR_MIGRTABLE
  x86/virt/tdx: Print TDX module version during init
  x86/virt/tdx: Retrieve TDX module version
---

883af1f8e8788b99c5cd6797219bca44571775c9
diff --cc drivers/virt/coco/tdx-guest/tdx-guest.c
index 7cee97559ba29,23ef3991c4d5a..a9ecc46df187d
--- a/drivers/virt/coco/tdx-guest/tdx-guest.c
+++ b/drivers/virt/coco/tdx-guest/tdx-guest.c
@@@ -309,12 -306,12 +309,17 @@@ static int tdx_report_new_locked(struc
  		return ret;
  	}
  
+ 	if (quote_buf->status != GET_QUOTE_SUCCESS) {
+ 		pr_debug("GetQuote request failed, status:%llx\n", quote_buf->status);
+ 		return -EIO;
+ 	}
+ 
 -	buf = kvmemdup(quote_buf->data, quote_buf->out_len, GFP_KERNEL);
 +	out_len = READ_ONCE(quote_buf->out_len);
 +
 +	if (out_len > TDX_QUOTE_MAX_LEN)
 +		return -EFBIG;
 +
 +	buf = kvmemdup(quote_buf->data, out_len, GFP_KERNEL);
  	if (!buf)
  		return -ENOMEM;