Kernel KVM virtualization development
 help / color / mirror / Atom feed
From: sundayjiang <jianghaotian.sunday@gmail.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, seanjc@google.com
Subject: [PATCH] KVM: TDX: Use check_shl_overflow() for nr_pages validation
Date: Thu, 2 Jul 2026 15:03:45 +0800	[thread overview]
Message-ID: <010b3966-8c8c-4f19-8135-a1041d5f97d6@gmail.com> (raw)

 From 4be3dcf1fca4acd2bf9c22bd604c913ba1774035 Mon Sep 17 00:00:00 2001
From: Haotian Jiang <jianghaotian.sunday@gmail.com>
Date: Thu, 2 Jul 2026 14:13:27 +0800
Subject: [PATCH] KVM: TDX: Use check_shl_overflow() for nr_pages validation

The nr_pages field in struct kvm_tdx_init_mem_region is a u64 that comes
directly from userspace via copy_from_user().  The current validation
uses a manual overflow check:

     region.gpa + (region.nr_pages << PAGE_SHIFT) <= region.gpa

When nr_pages >= 2^52, the shift (nr_pages << PAGE_SHIFT) wraps around
to a small value, bypassing the wrap check.  While downstream protections
(gfn_to_memslot() returning NULL for GFNs outside any memslot, and
kvm_slot_has_gmem() checking for NULL) prevent any actual out-of-bounds
access, the overflow itself is a real bug that should be caught at the
validation layer.

Replace the manual overflow check with check_shl_overflow() and
check_add_overflow() to correctly detect the wrap-around, and use the
computed end_gpa for the subsequent vt_is_tdx_private_gpa() check to
avoid redundant and potentially overflowing arithmetic.

Signed-off-by: Haotian Jiang <jianghaotian.sunday@gmail.com>
---
  arch/x86/kvm/vmx/tdx.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
index 989ab29b8c6f..9c6aa95ea1e1 100644
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -3234,14 +3234,20 @@ static int tdx_vcpu_init_mem_region(struct 
kvm_vcpu *vcpu, struct kvm_tdx_cmd *c
      if (cmd->flags & ~KVM_TDX_MEASURE_MEMORY_REGION)
          return -EINVAL;

+    u64 nr_bytes, end_gpa;
+
      if (copy_from_user(&region, u64_to_user_ptr(cmd->data), 
sizeof(region)))
          return -EFAULT;

+    if (check_shl_overflow(region.nr_pages, PAGE_SHIFT, &nr_bytes) ||
+        check_add_overflow(region.gpa, nr_bytes, &end_gpa))
+        return -EINVAL;
+
      if (!PAGE_ALIGNED(region.source_addr) || !PAGE_ALIGNED(region.gpa) ||
          !region.nr_pages ||
-        region.gpa + (region.nr_pages << PAGE_SHIFT) <= region.gpa ||
+        end_gpa <= region.gpa ||
          !vt_is_tdx_private_gpa(kvm, region.gpa) ||
-        !vt_is_tdx_private_gpa(kvm, region.gpa + (region.nr_pages << 
PAGE_SHIFT) - 1))
+        !vt_is_tdx_private_gpa(kvm, end_gpa - 1))
          return -EINVAL;

      ret = 0;
-- 
2.34.1



             reply	other threads:[~2026-07-02  7:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-02  7:03 sundayjiang [this message]
     [not found] <CAG8aMMegOz4SVbzJK2P1n0iL17t3e+wQPcLPE+Cn+t3ioOa+EQ@mail.gmail.com>
2026-07-07 16:42 ` [PATCH] KVM: TDX: Use check_shl_overflow() for nr_pages validation Sean Christopherson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=010b3966-8c8c-4f19-8135-a1041d5f97d6@gmail.com \
    --to=jianghaotian.sunday@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox