author: Paolo Bonzini <pbonzini@redhat.com> 2021-06-09 01:49:13 -0400
committer: Paolo Bonzini <pbonzini@redhat.com> 2021-06-09 01:49:13 -0400
commit: 4422829e8053068e0225e4d0ef42dc41ea7c9ef5
parent: da27a83fd6cc7780fea190e1f5c19e87019da65c
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 2 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 74995f0a2a3c..8583ed3ff344 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1191,8 +1191,8 @@ __gfn_to_hva_memslot(const struct kvm_memory_slot *slot, gfn_t gfn)
* table walks, do not let the processor speculate loads outside
* the guest's registered memslots.
*/
- unsigned long offset = array_index_nospec(gfn - slot->base_gfn,
- slot->npages);
+ unsigned long offset = gfn - slot->base_gfn;
+ offset = array_index_nospec(offset, slot->npages);
return slot->userspace_addr + offset * PAGE_SIZE;
}