Skip to contentSkip to conversation

KVM: SEV: Reject non-positive effective lengths during LAUNCH_UPDATE

PATCH Superseded Sean Christopherson 2 participants 3 messages Aug 26, 2025 – Sep 8, 2025

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Sean Christopherson

author maintainer
#0 lore raw

PATCH 1/1 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'.

Cc Thomas Lendacky <[email protected]>
Cc Michael Roth <[email protected]>

---

Compile tested only. Came across this when trying to figure out how to handle the batching of gmem post-populate calls.

 arch/x86/kvm/svm/sev.c | 2 ++
 virt/kvm/guest_memfd.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +2 -0
index f4381878a9e5..746a57bf1f71 100644
@@ -2360,6 +2360,8 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp)
 		return -EINVAL;
 
 	npages = params.len / PAGE_SIZE;
+	if (npages <= 0)
+		return -EINVAL;
 
 	/*
 	 * For each GFN that's being prepared as part of the initial guest
virt/kvm/guest_memfd.c +2 -1
index 7d85cc33c0bb..79552467add5 100644
@@ -639,7 +639,8 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long
 	long i;
 
 	lockdep_assert_held(&kvm->slots_lock);
-	if (npages < 0)
+
+	if (WARN_ON_ONCE(npages <= 0))
 		return -EINVAL;
 
 	slot = gfn_to_memslot(kvm, start_gfn);

base-commit: ecbcc2461839e848970468b44db32282e5059925

Signature · 1 line
2.51.0.268.g9569e192d0-goog
#1 lore raw
Quoted 33 lines · Sean Christopherson

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'.

Cc Thomas Lendacky <[email protected]>
Cc Michael Roth <[email protected]>

---

Compile tested only. Came across this when trying to figure out how to handle the batching of gmem post-populate calls.

 arch/x86/kvm/svm/sev.c | 2 ++
 virt/kvm/guest_memfd.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +0 -0
index f4381878a9e5..746a57bf1f71 100644

arch/x86/kvm/svm/sev.c static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp) · line 2364

Quoted 5 lines
arch/x86/kvm/svm/sev.c +2 -0
@@ -2360,6 +2360,8 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp)
 		return -EINVAL;
 
 	npages = params.len / PAGE_SIZE;
+	if (npages <= 0)
+		return -EINVAL;

Would it make sense to include a !params.len in the giant if check just above this, e.g.:

	if (!params.len || !PAGE_ALIGNED(params.len) || ...

?

That way everything related to checking "params" remains in the one statement.

Thanks,
Tom

Quoted 19 lines
arch/x86/kvm/svm/sev.c +0 -0
 	/*
 	 * For each GFN that's being prepared as part of the initial guest
virt/kvm/guest_memfd.c +2 -1
index 7d85cc33c0bb..79552467add5 100644
@@ -639,7 +639,8 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long
 	long i;
 
 	lockdep_assert_held(&kvm->slots_lock);
-	if (npages < 0)
+
+	if (WARN_ON_ONCE(npages <= 0))
 		return -EINVAL;
 
 	slot = gfn_to_memslot(kvm, start_gfn);

base-commit: ecbcc2461839e848970468b44db32282e5059925

author maintainer
#2 lore raw
Quoted 15 lines · Tom Lendacky

arch/x86/kvm/svm/sev.c static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp) · line 2364

Quoted 10 lines · Sean Christopherson
arch/x86/kvm/svm/sev.c +2 -0
index f4381878a9e5..746a57bf1f71 100644
@@ -2360,6 +2360,8 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp)
 		return -EINVAL;
 
 	npages = params.len / PAGE_SIZE;
+	if (npages <= 0)
+		return -EINVAL;

Would it make sense to include a !params.len in the giant if check just above this, e.g.:

Quoted 6 lines
	if (!params.len || !PAGE_ALIGNED(params.len) || ...

?

That way everything related to checking "params" remains in the one statement.

Oh, yeah, duh. I overlooked that the only way for npages to be '0' is if params.len is '0', because the PAGE_ALIGNED() check will handed len == 1-4095.

Will send a v2. Thanks Tom!