diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-01-24 14:06:48 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-03-20 16:25:05 +0100 |
| commit | 3863dff0c3dd72984395c93b12383b393c5c3989 (patch) | |
| tree | c19ef0756ab2475e3bc5477357db51fcebf5687c /arch/x86 | |
| parent | 6c6c5e0311c83ffe75e14260fb83e05e21e1d488 (diff) | |
| download | linux-3863dff0c3dd72984395c93b12383b393c5c3989.tar.gz linux-3863dff0c3dd72984395c93b12383b393c5c3989.tar.bz2 linux-3863dff0c3dd72984395c93b12383b393c5c3989.zip | |
kvm: fix usage of uninit spinlock in avic_vm_destroy()
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 <dvyukov@google.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: kvm@vger.kernel.org
Cc: syzkaller@googlegroups.com
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/svm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index d1efe2c62b3f..5fba70646c32 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1379,6 +1379,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) |