[PATCH] KVM: mips: use id_to_memslot correctly

[PATCH] KVM: mips: use id_to_memslot correctly

[Paolo Bonzini]

The argument to KVM_GET_DIRTY_LOG is a memslot id; it may not
match the position in the memslots array, which is sorted by
gfn.

Cc: stable@vger.kernel.org
Cc: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/mips/kvm/mips.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index bb68e8d520e8..52f205ae1281 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -982,7 +982,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
 
 	/* If nothing is dirty, don't bother messing with page tables. */
 	if (is_dirty) {
-		memslot = &kvm->memslots->memslots[log->slot];
+		memslot = id_to_memslot(kvm->memslots, log->slot);
 
 		ga = memslot->base_gfn << PAGE_SHIFT;
 		ga_end = ga + (memslot->npages << PAGE_SHIFT);
-- 
2.4.0

Re: [PATCH] KVM: mips: use id_to_memslot correctly

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

Hi Paolo,

On 18/05/15 09:14, Paolo Bonzini wrote:
> The argument to KVM_GET_DIRTY_LOG is a memslot id; it may not
> match the position in the memslots array, which is sorted by
> gfn.
> 
> Cc: stable@vger.kernel.org
> Cc: James Hogan <james.hogan@imgtec.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: James Hogan <james.hogan@imgtec.com>

(I have the same patch in my pile).

Thanks
James

> ---
>  arch/mips/kvm/mips.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
> index bb68e8d520e8..52f205ae1281 100644
> --- a/arch/mips/kvm/mips.c
> +++ b/arch/mips/kvm/mips.c
> @@ -982,7 +982,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
>  
>  	/* If nothing is dirty, don't bother messing with page tables. */
>  	if (is_dirty) {
> -		memslot = &kvm->memslots->memslots[log->slot];
> +		memslot = id_to_memslot(kvm->memslots, log->slot);
>  
>  		ga = memslot->base_gfn << PAGE_SHIFT;
>  		ga_end = ga + (memslot->npages << PAGE_SHIFT);
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]