Commit e0135a10 authored by Paolo Bonzini's avatar Paolo Bonzini

KVM: x86: do not pass poisoned hva to __kvm_set_memory_region

__kvm_set_memory_region does not use the hva at all, so trying to
catch use-after-delete is pointless and, worse, it fails access_ok
now that we apply it to all memslots including private kernel ones.
This fixes an AVIC regression.

Fixes: 09d952c9 ("KVM: check userspace_addr for all memslots")
Reported-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cfb65c15
...@@ -9951,13 +9951,8 @@ int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size) ...@@ -9951,13 +9951,8 @@ int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size)
if (!slot || !slot->npages) if (!slot || !slot->npages)
return 0; return 0;
/*
* Stuff a non-canonical value to catch use-after-delete. This
* ends up being 0 on 32-bit KVM, but there's no better
* alternative.
*/
hva = (unsigned long)(0xdeadull << 48);
old_npages = slot->npages; old_npages = slot->npages;
hva = 0;
} }
for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) { for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment