KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()

[sfrench/cifs-2.6.git] / arch / x86 / kvm / svm / sev.c

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index f760106c31f8a58d2941dbabd82531b9779089fa..a132547fcfb52ffba57eb9c18111b0822004000e 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -1975,20 +1975,22 @@ int sev_mem_enc_register_region(struct kvm *kvm,
                goto e_free;
        }
 
-       region->uaddr = range->addr;
-       region->size = range->size;
-
-       list_add_tail(&region->list, &sev->regions_list);
-       mutex_unlock(&kvm->lock);
-
        /*
         * The guest may change the memory encryption attribute from C=0 -> C=1
         * or vice versa for this memory range. Lets make sure caches are
         * flushed to ensure that guest data gets written into memory with
-        * correct C-bit.
+        * correct C-bit.  Note, this must be done before dropping kvm->lock,
+        * as region and its array of pages can be freed by a different task
+        * once kvm->lock is released.
         */
        sev_clflush_pages(region->pages, region->npages);
 
+       region->uaddr = range->addr;
+       region->size = range->size;
+
+       list_add_tail(&region->list, &sev->regions_list);
+       mutex_unlock(&kvm->lock);
+
        return ret;
 
 e_free: