Skip to content

Commit

Permalink
KVM: PPC: Book3S HV: Report correct HPT entry index when reading HPT
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mackerras authored and Alexander Graf committed Dec 6, 2012
1 parent a64fd70 commit 05dd85f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/kvm/book3s_64_mmu_hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 &&
Expand Down

0 comments on commit 05dd85f

Please sign in to comment.