]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: SVM: Zero out the VMCB array used to track SEV ASID association
authorSean Christopherson <seanjc@google.com>
Thu, 22 Apr 2021 02:11:11 +0000 (19:11 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:50:17 +0000 (10:50 +0200)
[ Upstream commit 3b1902b87bf11f1c6a84368470dc13da6f3da3bd ]

Zero out the array of VMCB pointers so that pre_sev_run() won't see
garbage when querying the array to detect when an SEV ASID is being
associated with a new VMCB.  In practice, reading random values is all
but guaranteed to be benign as a false negative (which is extremely
unlikely on its own) can only happen on CPU0 on the first VMRUN and would
only cause KVM to skip the ASID flush.  For anything bad to happen, a
previous instance of KVM would have to exit without flushing the ASID,
_and_ KVM would have to not flush the ASID at any time while building the
new SEV guest.

Cc: Borislav Petkov <bp@suse.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
Fixes: 70cd94e60c73 ("KVM: SVM: VMRUN should use associated ASID when SEV is enabled")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210422021125.3417167-2-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/svm/svm.c

index c8033f2586f16268dc00e08d35a6b76cda14b7f7..99592e03658b4269594b8a9155bd94ff631da4ff 100644 (file)
@@ -576,9 +576,8 @@ static int svm_cpu_init(int cpu)
        clear_page(page_address(sd->save_area));
 
        if (svm_sev_enabled()) {
-               sd->sev_vmcbs = kmalloc_array(max_sev_asid + 1,
-                                             sizeof(void *),
-                                             GFP_KERNEL);
+               sd->sev_vmcbs = kcalloc(max_sev_asid + 1, sizeof(void *),
+                                       GFP_KERNEL);
                if (!sd->sev_vmcbs)
                        goto free_save_area;
        }