1 files changed, 15 insertions, 5 deletions

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 4c513387309..5a688a2756b 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -78,7 +78,7 @@ static void change_pte_range(struct mm_struct *mm, pmd_t *pmd,
         pte_unmap_unlock(pte - 1, ptl);
 }
 
-static inline void change_pmd_range(struct mm_struct *mm, pud_t *pud,
+static inline void change_pmd_range(struct vm_area_struct *vma, pud_t *pud,
                 unsigned long addr, unsigned long end, pgprot_t newprot,
                 int dirty_accountable)
 {
@@ -88,13 +88,21 @@ static inline void change_pmd_range(struct mm_struct *mm, pud_t *pud,
         pmd = pmd_offset(pud, addr);
         do {
                 next = pmd_addr_end(addr, end);
+                if (pmd_trans_huge(*pmd)) {
+                        if (next - addr != HPAGE_PMD_SIZE)
+                                split_huge_page_pmd(vma->vm_mm, pmd);
+                        else if (change_huge_pmd(vma, pmd, addr, newprot))
+                                continue;
+                        /* fall through */
+                }
                 if (pmd_none_or_clear_bad(pmd))
                         continue;
-                change_pte_range(mm, pmd, addr, next, newprot, dirty_accountable);
+                change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
+                                 dirty_accountable);
         } while (pmd++, addr = next, addr != end);
 }
 
-static inline void change_pud_range(struct mm_struct *mm, pgd_t *pgd,
+static inline void change_pud_range(struct vm_area_struct *vma, pgd_t *pgd,
                 unsigned long addr, unsigned long end, pgprot_t newprot,
                 int dirty_accountable)
 {
@@ -106,7 +114,8 @@ static inline void change_pud_range(struct mm_struct *mm, pgd_t *pgd,
                 next = pud_addr_end(addr, end);
                 if (pud_none_or_clear_bad(pud))
                         continue;
-                change_pmd_range(mm, pud, addr, next, newprot, dirty_accountable);
+                change_pmd_range(vma, pud, addr, next, newprot,
+                                 dirty_accountable);
         } while (pud++, addr = next, addr != end);
 }
 
@@ -126,7 +135,8 @@ static void change_protection(struct vm_area_struct *vma,
                 next = pgd_addr_end(addr, end);
                 if (pgd_none_or_clear_bad(pgd))
                         continue;
-                change_pud_range(mm, pgd, addr, next, newprot, dirty_accountable);
+                change_pud_range(vma, pgd, addr, next, newprot,
+                                 dirty_accountable);
         } while (pgd++, addr = next, addr != end);
         flush_tlb_range(vma, start, end);
 }