mm: migrate: Close race between migration completion and mprotect
authorMel Gorman <>
Thu, 2 Oct 2014 18:47:41 +0000 (19:47 +0100)
committerBen Hutchings <>
Wed, 5 Nov 2014 20:27:46 +0000 (20:27 +0000)
commit d3cb8bf6081b8b7a2dabb1264fe968fd870fa595 upstream.

A migration entry is marked as write if pte_write was true at the time the
entry was created. The VMA protections are not double checked when migration
entries are being removed as mprotect marks write-migration-entries as
read. It means that potentially we take a spurious fault to mark PTEs write
again but it's straight-forward. However, there is a race between write
migrations being marked read and migrations finishing. This potentially
allows a PTE to be write that should have been read. Close this race by
double checking the VMA permissions using maybe_mkwrite when migration

[ use maybe_mkwrite]
Signed-off-by: Mel Gorman <>
Acked-by: Rik van Riel <>
Signed-off-by: Linus Torvalds <>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <>

index 09d6a9d..7d26ea5 100644 (file)
@@ -141,8 +141,11 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
        pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
+       /* Recheck VMA as permissions can change since migration started  */
        if (is_write_migration_entry(entry))
-               pte = pte_mkwrite(pte);
+               pte = maybe_mkwrite(pte, vma);
        if (PageHuge(new))
                pte = pte_mkhuge(pte);