Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a7e63e authored by David Hildenbrand's avatar David Hildenbrand Committed by Greg Kroah-Hartman
Browse files

s390/mm: validate VMA in PGSTE manipulation functions 



commit fe3d10024073f06f04c74b9674bd71ccc1d787cf upstream.

We should not walk/touch page tables outside of VMA boundaries when
holding only the mmap sem in read mode. Evil user space can modify the
VMA layout just before this function runs and e.g., trigger races with
page table removal code since commit dd2283f2605e ("mm: mmap: zap pages
with read mmap_sem in munmap"). gfn_to_hva() will only translate using
KVM memory regions, but won't validate the VMA.

Further, we should not allocate page tables outside of VMA boundaries: if
evil user space decides to map hugetlbfs to these ranges, bad things will
happen because we suddenly have PTE or PMD page tables where we
shouldn't have them.

Similarly, we have to check if we suddenly find a hugetlbfs VMA, before
calling get_locked_pte().

Fixes: 2d42f947 ("s390/kvm: Add PGSTE manipulation functions")
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20210909162248.14969-4-david@redhat.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2692931d

arch/s390/mm/pgtable.c

+13 −0
Original line number Diff line number Diff line
@@ -970,6 +970,7 @@ EXPORT_SYMBOL(get_guest_storage_key); 
int pgste_perform_essa(struct mm_struct *mm, unsigned long hva, int orc,

			unsigned long *oldpte, unsigned long *oldpgste)

{

	struct vm_area_struct *vma;

	unsigned long pgstev;

	spinlock_t *ptl;

	pgste_t pgste;
@@ -979,6 +980,10 @@ int pgste_perform_essa(struct mm_struct *mm, unsigned long hva, int orc, 
	WARN_ON_ONCE(orc > ESSA_MAX);

	if (unlikely(orc > ESSA_MAX))

		return -EINVAL;



	vma = find_vma(mm, hva);

	if (!vma || hva < vma->vm_start || is_vm_hugetlb_page(vma))

		return -EFAULT;

	ptep = get_locked_pte(mm, hva, &ptl);

	if (unlikely(!ptep))

		return -EFAULT;
@@ -1071,10 +1076,14 @@ EXPORT_SYMBOL(pgste_perform_essa); 
int set_pgste_bits(struct mm_struct *mm, unsigned long hva,

			unsigned long bits, unsigned long value)

{

	struct vm_area_struct *vma;

	spinlock_t *ptl;

	pgste_t new;

	pte_t *ptep;



	vma = find_vma(mm, hva);

	if (!vma || hva < vma->vm_start || is_vm_hugetlb_page(vma))

		return -EFAULT;

	ptep = get_locked_pte(mm, hva, &ptl);

	if (unlikely(!ptep))

		return -EFAULT;
@@ -1099,9 +1108,13 @@ EXPORT_SYMBOL(set_pgste_bits); 
 */

int get_pgste(struct mm_struct *mm, unsigned long hva, unsigned long *pgstep)

{

	struct vm_area_struct *vma;

	spinlock_t *ptl;

	pte_t *ptep;



	vma = find_vma(mm, hva);

	if (!vma || hva < vma->vm_start || is_vm_hugetlb_page(vma))

		return -EFAULT;

	ptep = get_locked_pte(mm, hva, &ptl);

	if (unlikely(!ptep))

		return -EFAULT;