Commit d3cb8bf6 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: migrate: Close race between migration completion and mprotect

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: default avatarMel Gorman <>
Acked-by: default avatarRik van Riel <>
Signed-off-by: default avatarLinus Torvalds <>
parent 50dddff3
......@@ -146,8 +146,11 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
if (pte_swp_soft_dirty(*ptep))
pte = pte_mksoft_dirty(pte);
/* 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);
Supports Markdown
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