Skip to content

Commit 5b66e33

Browse files
committed
KVM: SEV: Reject non-positive effective lengths during LAUNCH_UPDATE
Check for an invalid length during LAUNCH_UPDATE at the start of snp_launch_update() instead of subtly relying on kvm_gmem_populate() to detect the bad state. Code that directly handles userspace input absolutely should sanitize those inputs; failure to do so is asking for bugs where KVM consumes an invalid "npages". Keep the check in gmem, but wrap it in a WARN to flag any bad usage by the caller. Note, this is technically an ABI change as KVM would previously allow a length of '0'. But allowing a length of '0' is nonsensical and creates pointless conundrums in KVM. E.g. an empty range is arguably neither private nor shared, but LAUNCH_UPDATE will fail if the starting gpa can't be made private. In practice, no known or well-behaved VMM passes a length of '0'. Note #2, the PAGE_ALIGNED(params.len) check ensures that lengths between 1 and 4095 (inclusive) are also rejected, i.e. that KVM won't end up with npages=0 when doing "npages = params.len / PAGE_SIZE". Cc: Thomas Lendacky <thomas.lendacky@amd.com> Cc: Michael Roth <michael.roth@amd.com> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Link: https://lore.kernel.org/r/20250919211649.1575654-1-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 4135a9a commit 5b66e33

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/x86/kvm/svm/sev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2353,7 +2353,7 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp)
23532353
pr_debug("%s: GFN start 0x%llx length 0x%llx type %d flags %d\n", __func__,
23542354
params.gfn_start, params.len, params.type, params.flags);
23552355

2356-
if (!PAGE_ALIGNED(params.len) || params.flags ||
2356+
if (!params.len || !PAGE_ALIGNED(params.len) || params.flags ||
23572357
(params.type != KVM_SEV_SNP_PAGE_TYPE_NORMAL &&
23582358
params.type != KVM_SEV_SNP_PAGE_TYPE_ZERO &&
23592359
params.type != KVM_SEV_SNP_PAGE_TYPE_UNMEASURED &&

virt/kvm/guest_memfd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,8 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long
639639
long i;
640640

641641
lockdep_assert_held(&kvm->slots_lock);
642-
if (npages < 0)
642+
643+
if (WARN_ON_ONCE(npages <= 0))
643644
return -EINVAL;
644645

645646
slot = gfn_to_memslot(kvm, start_gfn);

0 commit comments

Comments
 (0)