KVM: PPC: Book3S HV: Report correct HPT entry index when reading HPT

This fixes a bug in the code which allows userspace to read out the
contents of the guest's hashed page table (HPT).  On the second and
subsequent passes through the HPT, when we are reporting only those
entries that have changed, we were incorrectly initializing the index
field of the header with the index of the first entry we skipped
rather than the first changed entry.  This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 1029e2201bf6766aff70884b7e2082fabb34ffd7..ac6b5acb99b90147f6593d68f5fb2d4cd7f2c7e4 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -1282,7 +1282,6 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,
        while (nb + sizeof(hdr) + HPTE_SIZE < count) {
                /* Initialize header */
                hptr = (struct kvm_get_htab_header __user *)buf;
-               hdr.index = i;
                hdr.n_valid = 0;
                hdr.n_invalid = 0;
                nw = nb;
@@ -1298,6 +1297,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,
                                ++revp;
                        }
                }
+               hdr.index = i;
 
                /* Grab a series of valid entries */
                while (i < kvm->arch.hpt_npte &&