Commit 28f091bc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: MMU: shadow nested paging does not have PKU 



Initialize the mask for PKU permissions as if CR4.PKE=0, avoiding
incorrect interpretations of the nested hypervisor's page tables.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4b85c921

arch/x86/kvm/mmu/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -4855,7 +4855,7 @@ void kvm_init_shadow_npt_mmu(struct kvm_vcpu *vcpu, unsigned long cr0, 
	struct kvm_mmu *context = &vcpu->arch.guest_mmu;

	struct kvm_mmu_role_regs regs = {

		.cr0 = cr0,

		.cr4 = cr4,

		.cr4 = cr4 & ~X86_CR4_PKE,

		.efer = efer,

	};

	union kvm_mmu_role new_role;
@@ -4919,7 +4919,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly, 
	context->direct_map = false;



	update_permission_bitmask(context, true);

	update_pkru_bitmask(context);

	context->pkru_mask = 0;

	reset_rsvds_bits_mask_ept(vcpu, context, execonly);

	reset_ept_shadow_zero_bits_mask(vcpu, context, execonly);

}