Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / arch / powerpc / kvm / book3s_64_mmu.c

diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index c110145522e6cfdcc96b0506ff56d8d360d6455e..83da1f868fd5356dce92c721d963de0b794584f2 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -206,7 +206,8 @@ static int decode_pagesize(struct kvmppc_slb *slbe, u64 r)
 }
 
 static int kvmppc_mmu_book3s_64_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
-                               struct kvmppc_pte *gpte, bool data)
+                                     struct kvmppc_pte *gpte, bool data,
+                                     bool iswrite)
 {
        struct kvmppc_slb *slbe;
        hva_t ptegp;
@@ -345,8 +346,8 @@ do_second:
                r |= HPTE_R_R;
                put_user(r >> 8, addr + 6);
        }
-       if (data && gpte->may_write && !(r & HPTE_R_C)) {
-               /* Set the dirty flag -- XXX even if not writing */
+       if (iswrite && gpte->may_write && !(r & HPTE_R_C)) {
+               /* Set the dirty flag */
                /* Use a single byte write */
                char __user *addr = (char __user *) &pteg[i+1];
                r |= HPTE_R_C;
@@ -355,7 +356,7 @@ do_second:
 
        mutex_unlock(&vcpu->kvm->arch.hpt_mutex);
 
-       if (!gpte->may_read)
+       if (!gpte->may_read || (iswrite && !gpte->may_write))
                return -EPERM;
        return 0;