Skip to content

Commit 5ef1d8c

Browse files
sean-jcbonzini
authored andcommitted
KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
Do the cache flush of converted pages in svm_register_enc_region() before dropping kvm->lock to fix use-after-free issues where region and/or its array of pages could be freed by a different task, e.g. if userspace has __unregister_enc_region_locked() already queued up for the region. Note, the "obvious" alternative of using local variables doesn't fully resolve the bug, as region->pages is also dynamically allocated. I.e. the region structure itself would be fine, but region->pages could be freed. Flushing multiple pages under kvm->lock is unfortunate, but the entire flow is a rare slow path, and the manual flush is only needed on CPUs that lack coherency for encrypted memory. Fixes: 19a23da ("Fix unsynchronized access to sev members through svm_register_enc_region") Reported-by: Gabe Kirkpatrick <gkirkpatrick@google.com> Cc: Josh Eads <josheads@google.com> Cc: Peter Gonda <pgonda@google.com> Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20240217013430.2079561-1-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent c48617f commit 5ef1d8c

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

arch/x86/kvm/svm/sev.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,20 +1975,22 @@ int sev_mem_enc_register_region(struct kvm *kvm,
19751975
goto e_free;
19761976
}
19771977

1978-
region->uaddr = range->addr;
1979-
region->size = range->size;
1980-
1981-
list_add_tail(&region->list, &sev->regions_list);
1982-
mutex_unlock(&kvm->lock);
1983-
19841978
/*
19851979
* The guest may change the memory encryption attribute from C=0 -> C=1
19861980
* or vice versa for this memory range. Lets make sure caches are
19871981
* flushed to ensure that guest data gets written into memory with
1988-
* correct C-bit.
1982+
* correct C-bit. Note, this must be done before dropping kvm->lock,
1983+
* as region and its array of pages can be freed by a different task
1984+
* once kvm->lock is released.
19891985
*/
19901986
sev_clflush_pages(region->pages, region->npages);
19911987

1988+
region->uaddr = range->addr;
1989+
region->size = range->size;
1990+
1991+
list_add_tail(&region->list, &sev->regions_list);
1992+
mutex_unlock(&kvm->lock);
1993+
19921994
return ret;
19931995

19941996
e_free:

0 commit comments

Comments
 (0)