KVM: SEV: Compute the correct max length of the in-GHCB scratch area

When setting the length of the GHCB scratch area, and the area is in the
GHCB shared buffer, set the effective length of the scratch area to the max
possible size given the start of the guest-provided pointer, and the end of
the shared buffer.

The code was "fine" when first introduced, as KVM doesn't consult the
length of the buffer when emulating MMIO, because the passed in @len always
specifies the *max* size required.  But for PSC requests, the incoming @len
is just the minimum length (to process the header), and KVM needs to know
the full size of the scratch area to avoid buffer overflows (spoiler alert).

Opportunistically rename @len => @min_len to better reflect its role.

Fixes: 9b54e248d264 ("KVM: SEV: Add support to handle Page State Change VMGEXIT")
Cc: stable@vger.kernel.org
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Michael Roth <michael.roth@amd.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-ID: <20260501202250.2115252-7-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index cbb3040e07782c8c09328b3f831a939218fb46fc..6072fecfe994bb02a7aaf533bda440cb9983aafc 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -3662,7 +3662,7 @@ int pre_sev_run(struct vcpu_svm *svm, int cpu)
 }
 
 #define GHCB_SCRATCH_AREA_LIMIT                (16ULL * PAGE_SIZE)
-static int setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)
+static int setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 min_len)
 {
        struct vmcb_control_area *control = &svm->vmcb->control;
        u64 ghcb_scratch_beg, ghcb_scratch_end;
@@ -3675,10 +3675,10 @@ static int setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)
                goto e_scratch;
        }
 
-       scratch_gpa_end = scratch_gpa_beg + len;
+       scratch_gpa_end = scratch_gpa_beg + min_len;
        if (scratch_gpa_end < scratch_gpa_beg) {
                pr_err("vmgexit: scratch length (%#llx) not valid for scratch address (%#llx)\n",
-                      len, scratch_gpa_beg);
+                      min_len, scratch_gpa_beg);
                goto e_scratch;
        }
 
@@ -3702,6 +3702,8 @@ static int setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)
 
                scratch_va = (void *)svm->sev_es.ghcb;
                scratch_va += (scratch_gpa_beg - control->ghcb_gpa);
+
+               svm->sev_es.ghcb_sa_len = ghcb_scratch_end - scratch_gpa_beg;
        } else {
                /* GHCB v2 requires the scratch area to be within the GHCB. */
                if (to_kvm_sev_info(svm->vcpu.kvm)->ghcb_version >= 2)
@@ -3711,16 +3713,16 @@ static int setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)
                 * The guest memory must be read into a kernel buffer, so
                 * limit the size
                 */
-               if (len > GHCB_SCRATCH_AREA_LIMIT) {
+               if (min_len > GHCB_SCRATCH_AREA_LIMIT) {
                        pr_err("vmgexit: scratch area exceeds KVM limits (%#llx requested, %#llx limit)\n",
-                              len, GHCB_SCRATCH_AREA_LIMIT);
+                              min_len, GHCB_SCRATCH_AREA_LIMIT);
                        goto e_scratch;
                }
-               scratch_va = kvzalloc(len, GFP_KERNEL_ACCOUNT);
+               scratch_va = kvzalloc(min_len, GFP_KERNEL_ACCOUNT);
                if (!scratch_va)
                        return -ENOMEM;
 
-               if (kvm_read_guest(svm->vcpu.kvm, scratch_gpa_beg, scratch_va, len)) {
+               if (kvm_read_guest(svm->vcpu.kvm, scratch_gpa_beg, scratch_va, min_len)) {
                        /* Unable to copy scratch area from guest */
                        pr_err("vmgexit: kvm_read_guest for scratch area failed\n");
 
@@ -3736,11 +3738,10 @@ static int setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)
                 */
                svm->sev_es.ghcb_sa_sync = sync;
                svm->sev_es.ghcb_sa_free = true;
+               svm->sev_es.ghcb_sa_len = min_len;
        }
 
        svm->sev_es.ghcb_sa = scratch_va;
-       svm->sev_es.ghcb_sa_len = len;
-
        return 0;
 
 e_scratch: