Commit 730a11f9 authored by Liu Shixin's avatar Liu Shixin Committed by Will Deacon
Browse files

arm64/mm: add pud_user_exec() check in pud_user_accessible_page() 



Add check for the executable case in pud_user_accessible_page() too
like what we did for pte and pmd.

Fixes: 42b25471 ("arm64/mm: enable ARCH_SUPPORTS_PAGE_TABLE_CHECK")
Suggested-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Link: https://lore.kernel.org/r/20221122123137.429686-1-liushixin2@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 74c2f810

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) 
#define pud_leaf(pud)		(pud_present(pud) && !pud_table(pud))

#define pud_valid(pud)		pte_valid(pud_pte(pud))

#define pud_user(pud)		pte_user(pud_pte(pud))



#define pud_user_exec(pud)	pte_user_exec(pud_pte(pud))



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

{
@@ -867,7 +867,7 @@ static inline bool pmd_user_accessible_page(pmd_t pmd) 


static inline bool pud_user_accessible_page(pud_t pud)

{

	return pud_leaf(pud) && pud_user(pud);

	return pud_leaf(pud) && (pud_user(pud) || pud_user_exec(pud));

}

#endif