Skip to content

Commit d641053

Browse files
punitagrawalgregkh
authored andcommitted
KVM: arm/arm64: Check pagesize when allocating a hugepage at Stage 2
commit c507bab upstream. KVM only supports PMD hugepages at stage 2 but doesn't actually check that the provided hugepage memory pagesize is PMD_SIZE before populating stage 2 entries. In cases where the backing hugepage size is smaller than PMD_SIZE (such as when using contiguous hugepages), KVM can end up creating stage 2 mappings that extend beyond the supplied memory. Fix this by checking for the pagesize of userspace vma before creating PMD hugepage at stage 2. Fixes: 66b3923 ("arm64: hugetlb: add support for PTE contiguous bit") Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 550ba97 commit d641053

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

virt/kvm/arm/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
13101310
return -EFAULT;
13111311
}
13121312

1313-
if (is_vm_hugetlb_page(vma) && !logging_active) {
1313+
if (vma_kernel_pagesize(vma) == PMD_SIZE && !logging_active) {
13141314
hugetlb = true;
13151315
gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
13161316
} else {

0 commit comments

Comments
 (0)