projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05458ee
)
arm64/mm: add pud_user_exec() check in pud_user_accessible_page()
author
Liu Shixin
<liushixin2@huawei.com>
Tue, 22 Nov 2022 12:31:37 +0000
(20:31 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:58:17 +0000
(11:58 +0100)
commit
730a11f982e61aaef758ab552dfb7c30de79e99b
upstream.
Add check for the executable case in pud_user_accessible_page() too
like what we did for pte and pmd.
Fixes:
42b2547137f5
("arm64/mm: enable ARCH_SUPPORTS_PAGE_TABLE_CHECK")
Suggested-by: Will Deacon <will@kernel.org>
Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Link:
https://lore.kernel.org/r/20221122123137.429686-1-liushixin2@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/include/asm/pgtable.h
patch
|
blob
|
history
diff --git
a/arch/arm64/include/asm/pgtable.h
b/arch/arm64/include/asm/pgtable.h
index
edf6625
..
5582360
100644
(file)
--- a/
arch/arm64/include/asm/pgtable.h
+++ b/
arch/arm64/include/asm/pgtable.h
@@
-682,7
+682,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)
{
@@
-868,7
+868,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