Skip to content

Commit 23bc8f6

Browse files
Muchun Songwilldeacon
authored andcommitted
arm64: mm: fix p?d_leaf()
The pmd_leaf() is used to test a leaf mapped PMD, however, it misses the PROT_NONE mapped PMD on arm64. Fix it. A real world issue [1] caused by this was reported by Qian Cai. Also fix pud_leaf(). Link: https://patchwork.kernel.org/comment/24798260/ [1] Fixes: 8aa82df ("arm64: mm: add p?d_leaf() definitions") Reported-by: Qian Cai <quic_qiancai@quicinc.com> Signed-off-by: Muchun Song <songmuchun@bytedance.com> Link: https://lore.kernel.org/r/20220422060033.48711-1-songmuchun@bytedance.com Signed-off-by: Will Deacon <will@kernel.org>
1 parent 0ff74a2 commit 23bc8f6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm64/include/asm/pgtable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
535535
PMD_TYPE_TABLE)
536536
#define pmd_sect(pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \
537537
PMD_TYPE_SECT)
538-
#define pmd_leaf(pmd) pmd_sect(pmd)
538+
#define pmd_leaf(pmd) (pmd_present(pmd) && !pmd_table(pmd))
539539
#define pmd_bad(pmd) (!pmd_table(pmd))
540540

541541
#define pmd_leaf_size(pmd) (pmd_cont(pmd) ? CONT_PMD_SIZE : PMD_SIZE)
@@ -625,7 +625,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
625625
#define pud_none(pud) (!pud_val(pud))
626626
#define pud_bad(pud) (!pud_table(pud))
627627
#define pud_present(pud) pte_present(pud_pte(pud))
628-
#define pud_leaf(pud) pud_sect(pud)
628+
#define pud_leaf(pud) (pud_present(pud) && !pud_table(pud))
629629
#define pud_valid(pud) pte_valid(pud_pte(pud))
630630

631631
static inline void set_pud(pud_t *pudp, pud_t pud)

0 commit comments

Comments
 (0)