Commit b159f94c authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger

s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap()

... otherwise we will try unlocking a spinlock that was never locked via a
garbage pointer.

At the time we reach this code path, we usually successfully looked up
a PGSTE already; however, evil user space could have manipulated the VMA
layout in the meantime and triggered removal of the page table.

Fixes: 1e133ab2 ("s390/mm: split arch/s390/mm/pgtable.c")
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-3-david@redhat.comSigned-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 2d8fb8f3
...@@ -689,10 +689,11 @@ void __gmap_zap(struct gmap *gmap, unsigned long gaddr) ...@@ -689,10 +689,11 @@ void __gmap_zap(struct gmap *gmap, unsigned long gaddr)
/* Get pointer to the page table entry */ /* Get pointer to the page table entry */
ptep = get_locked_pte(gmap->mm, vmaddr, &ptl); ptep = get_locked_pte(gmap->mm, vmaddr, &ptl);
if (likely(ptep)) if (likely(ptep)) {
ptep_zap_unused(gmap->mm, vmaddr, ptep, 0); ptep_zap_unused(gmap->mm, vmaddr, ptep, 0);
pte_unmap_unlock(ptep, ptl); pte_unmap_unlock(ptep, ptl);
} }
}
} }
EXPORT_SYMBOL_GPL(__gmap_zap); EXPORT_SYMBOL_GPL(__gmap_zap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment