Patch "KVM: mips: use id_to_memslot correctly" has been added to the 4.0-stable tree

Patch "KVM: mips: use id_to_memslot correctly" has been added to the 4.0-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    KVM: mips: use id_to_memslot correctly

to the 4.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     kvm-mips-use-id_to_memslot-correctly.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 69a1220060c1523fd0515216eaa29e22f133b894 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 18 May 2015 08:35:43 +0200
Subject: KVM: mips: use id_to_memslot correctly

From: Paolo Bonzini <pbonzini@redhat.com>

commit 69a1220060c1523fd0515216eaa29e22f133b894 upstream.

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.

Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/kvm/mips.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -785,7 +785,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kv
 
 	/* 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);


Patches currently in stable-queue which might be from pbonzini@redhat.com are

queue-4.0/kvm-s390-virtio-ccw-don-t-overwrite-config-space-values.patch
queue-4.0/kvm-nsvm-check-for-nrips-support-before-updating-control-field.patch
queue-4.0/kvm-x86-properly-restore-lvt0.patch
queue-4.0/kvm-mips-use-id_to_memslot-correctly.patch
queue-4.0/kvm-x86-make-vapics_in_nmi_mode-atomic.patch