Commit c22e3514 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Fix nx access bit for huge pages 



We must set the bit before the shift, otherwise the wrong bit gets set.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent e3c5e7ec

drivers/kvm/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -382,9 +382,9 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
			metaphysical = 1;

			hugepage_access = walker->pte;

			hugepage_access &= PT_USER_MASK | PT_WRITABLE_MASK;

			hugepage_access >>= PT_WRITABLE_SHIFT;

			if (walker->pte & PT64_NX_MASK)

				hugepage_access |= (1 << 2);

			hugepage_access >>= PT_WRITABLE_SHIFT;

			table_gfn = (walker->pte & PT_BASE_ADDR_MASK)

				>> PAGE_SHIFT;

		} else {