Skip to content

Commit

Permalink
Fix NULL dereference in gfn_to_hva_prot()
Browse files Browse the repository at this point in the history
gfn_to_memslot() can return NULL or invalid slot. We need to check slot
validity before accessing it.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
  • Loading branch information
Gleb Natapov committed Oct 3, 2013
1 parent 517bf8f commit a2ac07f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions virt/kvm/kvm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a2ac07f

Please sign in to comment.