提交 c8141476 编写于 作者: N Nicholas Piggin 提交者: Yang Yingliang

mm: apply_to_pte_range warn and fail if a large pte is encountered

ascend inclusion
category: feature
bugzilla: NA
CVE: NA

https://lwn.net/ml/linux-kernel/20200825145753.529284-3-npiggin@gmail.com/
--------------

apply_to_pte_range might mistake a large pte for bad, or treat it as a
page table, resulting in a crash or corruption. Add a test to warn and
return error if large entries are found.
Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
Signed-off-by: NRui Xiang <rui.xiang@huawei.com>
Reviewed-by: NDing Tianhong <dingtianhong@huawei.com>
Reviewed-by: NZefan Li <lizefan@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 d3efb4d3
...@@ -2015,13 +2015,20 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, ...@@ -2015,13 +2015,20 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
} }
do { do {
next = pmd_addr_end(addr, end); next = pmd_addr_end(addr, end);
if (create || !pmd_none_or_clear_bad(pmd)) { if (pmd_none(*pmd) && !create)
err = apply_to_pte_range(mm, pmd, addr, next, fn, data, continue;
create); if (WARN_ON_ONCE(pmd_leaf(*pmd)))
if (err) return -EINVAL;
break; if (!pmd_none(*pmd) && WARN_ON_ONCE(pmd_bad(*pmd))) {
if (!create)
continue;
pmd_clear_bad(pmd);
} }
err = apply_to_pte_range(mm, pmd, addr, next, fn, data, create);
if (err)
break;
} while (pmd++, addr = next, addr != end); } while (pmd++, addr = next, addr != end);
return err; return err;
} }
...@@ -2042,13 +2049,20 @@ static int apply_to_pud_range(struct mm_struct *mm, p4d_t *p4d, ...@@ -2042,13 +2049,20 @@ static int apply_to_pud_range(struct mm_struct *mm, p4d_t *p4d,
} }
do { do {
next = pud_addr_end(addr, end); next = pud_addr_end(addr, end);
if (create || !pud_none_or_clear_bad(pud)) { if (pud_none(*pud) && !create)
err = apply_to_pmd_range(mm, pud, addr, next, fn, data, continue;
create); if (WARN_ON_ONCE(pud_leaf(*pud)))
if (err) return -EINVAL;
break; if (!pud_none(*pud) && WARN_ON_ONCE(pud_bad(*pud))) {
if (!create)
continue;
pud_clear_bad(pud);
} }
err = apply_to_pmd_range(mm, pud, addr, next, fn, data, create);
if (err)
break;
} while (pud++, addr = next, addr != end); } while (pud++, addr = next, addr != end);
return err; return err;
} }
...@@ -2069,13 +2083,20 @@ static int apply_to_p4d_range(struct mm_struct *mm, pgd_t *pgd, ...@@ -2069,13 +2083,20 @@ static int apply_to_p4d_range(struct mm_struct *mm, pgd_t *pgd,
} }
do { do {
next = p4d_addr_end(addr, end); next = p4d_addr_end(addr, end);
if (create || !p4d_none_or_clear_bad(p4d)) { if (p4d_none(*p4d) && !create)
err = apply_to_pud_range(mm, p4d, addr, next, fn, data, continue;
create); if (WARN_ON_ONCE(p4d_leaf(*p4d)))
if (err) return -EINVAL;
break; if (!p4d_none(*p4d) && WARN_ON_ONCE(p4d_bad(*p4d))) {
if (!create)
continue;
p4d_clear_bad(p4d);
} }
err = apply_to_pud_range(mm, p4d, addr, next, fn, data, create);
if (err)
break;
} while (p4d++, addr = next, addr != end); } while (p4d++, addr = next, addr != end);
return err; return err;
} }
...@@ -2094,8 +2115,15 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr, ...@@ -2094,8 +2115,15 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr,
pgd = pgd_offset(mm, addr); pgd = pgd_offset(mm, addr);
do { do {
next = pgd_addr_end(addr, end); next = pgd_addr_end(addr, end);
if (!create && pgd_none_or_clear_bad(pgd)) if (pgd_none(*pgd) && !create)
continue; continue;
if (WARN_ON_ONCE(pgd_leaf(*pgd)))
return -EINVAL;
if (!pgd_none(*pgd) && WARN_ON_ONCE(pgd_bad(*pgd))) {
if (!create)
continue;
pgd_clear_bad(pgd);
}
err = apply_to_p4d_range(mm, pgd, addr, next, fn, data, create); err = apply_to_p4d_range(mm, pgd, addr, next, fn, data, create);
if (err) if (err)
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册