diff options
| author | Alistair Popple <[email protected]> | 2020-09-04 23:35:58 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-09-05 19:14:30 +0000 |
| commit | ebdf8321eeeb623aed60f7ed16f7445363230118 (patch) | |
| tree | 3cb82fcd0eeeda39054b3a59223336c2830c3ba8 | |
| parent | mm: madvise: fix vma user-after-free (diff) | |
| download | kernel-ebdf8321eeeb623aed60f7ed16f7445363230118.tar.gz kernel-ebdf8321eeeb623aed60f7ed16f7445363230118.zip | |
mm/migrate: fixup setting UFFD_WP flag
Commit f45ec5ff16a75 ("userfaultfd: wp: support swap and page migration")
introduced support for tracking the uffd wp bit during page migration.
However the non-swap PTE variant was used to set the flag for zone device
private pages which are a type of swap page.
This leads to corruption of the swap offset if the original PTE has the
uffd_wp flag set.
Fixes: f45ec5ff16a75 ("userfaultfd: wp: support swap and page migration")
Signed-off-by: Alistair Popple <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Reviewed-by: Peter Xu <[email protected]>
Cc: Jérôme Glisse <[email protected]>
Cc: John Hubbard <[email protected]>
Cc: Ralph Campbell <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 34a842a8eb6a..ddb64253fe3e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -251,7 +251,7 @@ static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma, entry = make_device_private_entry(new, pte_write(pte)); pte = swp_entry_to_pte(entry); if (pte_swp_uffd_wp(*pvmw.pte)) - pte = pte_mkuffd_wp(pte); + pte = pte_swp_mkuffd_wp(pte); } } |