[AUTOSEL,for,4.9,004/100] kvm: fix usage of uninit spinlock in avic_vm_destroy()

Commit Message

Levin, Alexander Dec. 13, 2017, 1:56 a.m. UTC

From: Dmitry Vyukov <[e-mail]>

[ Upstream commit 3863dff0c3dd72984395c93b12383b393c5c3989 ]

If avic is not enabled, avic_vm_init() does nothing and returns early.
However, avic_vm_destroy() still tries to destroy what hasn't been created.
The only bad consequence of this now is that avic_vm_destroy() uses
svm_vm_data_hash_lock that hasn't been initialized (and is not meant
to be used at all if avic is not enabled).

Return early from avic_vm_destroy() if avic is not enabled.
It has nothing to destroy.

Signed-off-by: Dmitry Vyukov <[e-mail]>
Cc: Joerg Roedel <[e-mail]>
Cc: Paolo Bonzini <[e-mail]>
Cc: "Radim Krčmář" <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Reviewed-by: David Hildenbrand <[e-mail]>
Signed-off-by: Radim Krčmář <[e-mail]>
Signed-off-by: Sasha Levin <[e-mail]>
---
 arch/x86/kvm/svm.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.11.0

Patch

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 23f1a6bd7a0d..8148d8ca7930 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1382,6 +1382,9 @@  static void avic_vm_destroy(struct kvm *kvm)
 	unsigned long flags;
 	struct kvm_arch *vm_data = &kvm->arch;
 
+	if (!avic)
+		return;
+
 	avic_free_vm_id(vm_data->avic_vm_id);
 
 	if (vm_data->avic_logical_id_table_page)