OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
48d2f04
)
powerpc/32s: Fix is_module_segment() when MODULES_VADDR is defined
author
Christophe Leroy
<christophe.leroy@csgroup.eu>
Wed, 5 Aug 2020 15:27:28 +0000
(15:27 +0000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Tue, 18 Aug 2020 03:40:15 +0000
(13:40 +1000)
When MODULES_VADDR is defined, is_module_segment() shall check the
address against it instead of checking agains VMALLOC_START.
Fixes:
6ca055322da8
("powerpc/32s: Use dedicated segment for modules with STRICT_KERNEL_RWX")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link:
https://lore.kernel.org/r/07884ed033c31e074747b7eb8eaa329d15db07ec.1596641219.git.christophe.leroy@csgroup.eu
arch/powerpc/mm/book3s32/mmu.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/mm/book3s32/mmu.c
b/arch/powerpc/mm/book3s32/mmu.c
index
c016291
..
82ae9e0
100644
(file)
--- a/
arch/powerpc/mm/book3s32/mmu.c
+++ b/
arch/powerpc/mm/book3s32/mmu.c
@@
-191,10
+191,17
@@
static bool is_module_segment(unsigned long addr)
{
if (!IS_ENABLED(CONFIG_MODULES))
return false;
+#ifdef MODULES_VADDR
+ if (addr < ALIGN_DOWN(MODULES_VADDR, SZ_256M))
+ return false;
+ if (addr >= ALIGN(MODULES_END, SZ_256M))
+ return false;
+#else
if (addr < ALIGN_DOWN(VMALLOC_START, SZ_256M))
return false;
if (addr >= ALIGN(VMALLOC_END, SZ_256M))
return false;
+#endif
return true;
}