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

Commit 6d15ee49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm NULL deref fix from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  Fix NULL dereference in gfn_to_hva_prot()
parents afe05d41 a2ac07fe

virt/kvm/kvm_main.c

+4 −2
Original line number Diff line number Diff line
@@ -1064,10 +1064,12 @@ EXPORT_SYMBOL_GPL(gfn_to_hva); 
unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable)

{

	struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn);

	if (writable)

	unsigned long hva = __gfn_to_hva_many(slot, gfn, NULL, false);



	if (!kvm_is_error_hva(hva) && writable)

		*writable = !memslot_is_readonly(slot);



	return __gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, NULL, false);

	return hva;

}



static int kvm_read_hva(void *data, void __user *hva, int len)