Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e8c6bd9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Greg Kroah-Hartman
Browse files

KVM: x86: cleanup the page tracking SRCU instance 



commit 2beb6dad2e8f95d710159d5befb390e4f62ab5cf upstream.

SRCU uses a delayed work item.  Skip cleaning it up, and
the result is use-after-free in the work item callbacks.

Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Suggested-by: default avatarDmitry Vyukov <dvyukov@google.com>
Fixes: 0eb05bf2
Reviewed-by: default avatarXiao Guangrong <xiaoguangrong.eric@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79191ea3

arch/x86/include/asm/kvm_page_track.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct kvm_page_track_notifier_node { 
};



void kvm_page_track_init(struct kvm *kvm);

void kvm_page_track_cleanup(struct kvm *kvm);



void kvm_page_track_free_memslot(struct kvm_memory_slot *free,

				 struct kvm_memory_slot *dont);

arch/x86/kvm/page_track.c

+8 −0
Original line number Diff line number Diff line
@@ -156,6 +156,14 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn, 
	return !!ACCESS_ONCE(slot->arch.gfn_track[mode][index]);

}



void kvm_page_track_cleanup(struct kvm *kvm)

{

	struct kvm_page_track_notifier_head *head;



	head = &kvm->arch.track_notifier_head;

	cleanup_srcu_struct(&head->track_srcu);

}



void kvm_page_track_init(struct kvm *kvm)

{

	struct kvm_page_track_notifier_head *head;

arch/x86/kvm/x86.c

+1 −0
Original line number Diff line number Diff line
@@ -7976,6 +7976,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	kvm_free_vcpus(kvm);

	kvfree(rcu_dereference_check(kvm->arch.apic_map, 1));

	kvm_mmu_uninit_vm(kvm);

	kvm_page_track_cleanup(kvm);

}



void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,