1 files changed, 4 insertions, 0 deletions

diff --git a/mm/mremap.c b/mm/mremap.c
index fc45dc9a617b..a32fed454bd7 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -141,6 +141,10 @@ move_one_page(struct vm_area_struct *vma, unsigned long old_addr,
                         if (dst) {
                                 pte_t pte;
                                 pte = ptep_clear_flush(vma, old_addr, src);
+                                /* ZERO_PAGE can be dependant on virtual addr */
+                                if (pfn_valid(pte_pfn(pte)) &&
+                                        pte_page(pte) == ZERO_PAGE(old_addr))
+                                        pte = pte_wrprotect(mk_pte(ZERO_PAGE(new_addr), new_vma->vm_page_prot));
                                 set_pte_at(mm, new_addr, dst, pte);
                         } else
                                 error = -ENOMEM;